diff --git a/INSTALL.md b/INSTALL.md index c2d3f32daa..f16384450e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,23 +1,22 @@ # Prerequisites -| Linux | macOS | Windows 10 (build 18917+) | Windows 10 (1709+) | Windows Vista, 7, 8, 8.1, and 10 (1507, 1511, 1607, and 1703) -| ----- | ----- | ------------------------- | ------------------ | --------------------------------------------------------- -| none | [Xcode Command Line Tools package][xcode] | [Windows Subsystem for Linux 2][wsl2] | [Windows Subsystem for Linux][wsl] | MSYS2 (see below) +| Linux | macOS | Windows 10 +| - | - | - +| none | [Xcode Command Line Tools Package][xcode] | [Windows Terminal][terminal] and [Windows Subsystem for Linux (WSL)][wsl] -[xcode]: https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-DOWNLOADING_COMMAND_LINE_TOOLS_IS_NOT_AVAILABLE_IN_XCODE_FOR_MACOS_10_9__HOW_CAN_I_INSTALL_THEM_ON_MY_MACHINE_ -[wsl2]: https://docs.microsoft.com/windows/wsl/wsl2-install +[xcode]: https://developer.apple.com/library/archive/technotes/tn2339/_index.html +[terminal]: https://docs.microsoft.com/windows/terminal/get-started [wsl]: https://docs.microsoft.com/windows/wsl/install-win10 -The [prerelease version of the Linux subsystem](https://docs.microsoft.com/windows/wsl/install-legacy) available in the 1607 and 1703 releases of Windows 10 is obsolete so consider uninstalling it. +Independently from the specific OS, make sure that the `gcc`, `g++`, `make`, `git`, and `libpng` packages or their equivalents are installed and accessible to the development tools that are used by the project (this means that, for example, on Windows, the packages have to be installed in the WSL environment). The package names and installation methods may vary with each OS. -Make sure that the `build-essential`, `git`, and `libpng-dev` packages are installed. The `build-essential` package includes the `make`, `gcc-core`, and `g++` packages so they do not have to be obtained separately. MSYS2 does not include `libpng-dev` so it must be built from source. +Install the devkitARM toolchain of devkitPro as per [the instructions on their wiki](https://devkitpro.org/wiki/devkitPro_pacman). On Windows, follow the Linux instructions inside WSL as any steps about the Windows installer do not apply. -Install the **devkitARM** toolchain of [devkitPro](https://devkitpro.org/wiki/Getting_Started) and add its environment variables. For Windows versions without the Linux subsystem, the devkitPro [graphical installer](https://github.com/devkitPro/installer/releases) includes a preconfigured MSYS2 environment, thus the steps below are not required. +**Debian-based distro users:** This applies to Debian, Ubuntu, and similar distros, including in WSL. If necessary, install the `libarchive13`, `pkg-config`, and `gdebi-core` packages to be able to install devkitPro. - export DEVKITPRO=/opt/devkitPro - echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc - export DEVKITARM=$DEVKITPRO/devkitARM - echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc +**Windows 10 users:** WSL 2 is available in the 1903 release (build 18362) and later, therefore existing WSL 1 and [prerelease WSL](https://docs.microsoft.com/windows/wsl/install-legacy) users are recommended to update. Right-click the Start button or press `Win`+`X`, choose Run, and run `ms-settings:about` to determine the Windows version. Also check Windows Update to make sure your installation is up-to-date. + +**Windows 7 and 8.1 users:** pret is no longer focusing on support in pokeemerald for [old versions of Windows](https://support.microsoft.com/help/13853) so consider upgrading to a current release of Windows 10 or try a third-party guide like [this one](https://www.pokecommunity.com/showthread.php?t=425246) instead. # Installation @@ -33,22 +32,27 @@ To set up the repository: cd ../pokeemerald -To build **pokeemerald.gba** and confirm it matches the official ROM image: +To build **pokeemerald.gba** for the first time and confirm it matches the official ROM image: make compare -## Notes +If an OK is returned, then the installation went smoothly. -* If the base tools are not found on macOS in new Terminal sessions after the first successful build, run `echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile` once to prevent the issue from occurring again. Verify that the `devkitarm-rules` package is installed as well; if not, install it by running `sudo dkp-pacman -S devkitarm-rules`. +**Windows users:** Consider adding exceptions for the `pokeemerald` and `agbcc` folders in Windows Security using [these instructions](https://support.microsoft.com/help/4028485). This prevents Microsoft Defender from scanning them which might improve performance while building. -* If the repository was previously set up using Cygwin, delete the `.exe` files in the subfolders of the `tools` folder except for `agbcc` and try building again. [Learn the differences between MSYS2 and Cygwin.](https://github.com/msys2/msys2/wiki/How-does-MSYS2-differ-from-Cygwin) -# Guidance +# Start To build **pokeemerald.gba** with your changes: make +**macOS users:** If the base tools are not found in new Terminal sessions after the first successful build, run `echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile` once to prevent the issue from occurring again. Verify that the `devkitarm-rules` package is installed as well; if not, install it by running `sudo dkp-pacman -S devkitarm-rules`. + + +# Building guidance + + ## Parallel builds See [the GNU docs](https://www.gnu.org/software/make/manual/html_node/Parallel.html) and [this Stack Exchange thread](https://unix.stackexchange.com/questions/208568) for more information. @@ -59,19 +63,22 @@ To speed up building, run: `nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)). -## Building without dependency scanning -If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes. +## Debug info - make NODEP=1 +To build **pokeemerald.elf** with enhanced debug info: -## Building with devkitARM's C compiler + make DINFO=1 + + +## devkitARM's C compiler This project supports the `arm-none-eabi-gcc` compiler included with devkitARM r52. To build this target, simply run: make modern -## Building with other toolchains + +## Other toolchains To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`. @@ -83,8 +90,9 @@ The following is an example: To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present. -## Building with debug info -To build **pokeemerald.elf** with enhanced debug info, use the `DINFO` variable. +# Useful additional tools - make DINFO=1 +* [porymap](https://github.com/huderlem/porymap) for viewing and editing maps +* [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript)) +* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s index a780140785..24eb2df558 100644 --- a/berry_fix/asm/loader.s +++ b/berry_fix/asm/loader.s @@ -109,7 +109,7 @@ _1a0: strh r1, [r0, 0xa] @ SIOMLT_SEND ldr r0, =_data_2f0 ldr r1, =gCode - swi 0x11 << 16 + svc 0x11 << 16 ldr lr, =gCode bx lr .pool diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt index 94eabe8bce..09427dc8dc 100644 --- a/berry_fix/charmap.txt +++ b/berry_fix/charmap.txt @@ -454,7 +454,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean @ sound and music MUS_DUMMY = 00 00 -SE_KAIFUKU = 01 00 +SE_USE_ITEM = 01 00 SE_PC_LOGIN = 02 00 SE_PC_OFF = 03 00 SE_PC_ON = 04 00 @@ -462,476 +462,476 @@ SE_SELECT = 05 00 SE_WIN_OPEN = 06 00 SE_WALL_HIT = 07 00 SE_DOOR = 08 00 -SE_KAIDAN = 09 00 -SE_DANSA = 0A 00 -SE_JITENSYA = 0B 00 -SE_KOUKA_L = 0C 00 -SE_KOUKA_M = 0D 00 -SE_KOUKA_H = 0E 00 -SE_BOWA2 = 0F 00 -SE_POKE_DEAD = 10 00 -SE_NIGERU = 11 00 -SE_JIDO_DOA = 12 00 -SE_NAMINORI = 13 00 -SE_BAN = 14 00 +SE_EXIT = 09 00 +SE_LEDGE = 0A 00 +SE_BIKE_BELL = 0B 00 +SE_NOT_EFFECTIVE = 0C 00 +SE_EFFECTIVE = 0D 00 +SE_SUPER_EFFECTIVE = 0E 00 +SE_BALL_OPEN = 0F 00 +SE_FAINT = 10 00 +SE_FLEE = 11 00 +SE_SLIDING_DOOR = 12 00 +SE_SHIP = 13 00 +SE_BANG = 14 00 SE_PIN = 15 00 SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 +SE_BALL = 17 00 +SE_CONTEST_PLACE = 18 00 SE_A = 19 00 SE_I = 1A 00 SE_U = 1B 00 SE_E = 1C 00 SE_O = 1D 00 SE_N = 1E 00 -SE_SEIKAI = 1F 00 -SE_HAZURE = 20 00 +SE_SUCCESS = 1F 00 +SE_FAILURE = 20 00 SE_EXP = 21 00 -SE_JITE_PYOKO = 22 00 -SE_MU_PACHI = 23 00 -SE_TK_KASYA = 24 00 +SE_BIKE_HOP = 22 00 +SE_SWITCH = 23 00 +SE_CLICK = 24 00 SE_FU_ZAKU = 25 00 -SE_FU_ZAKU2 = 26 00 -SE_FU_ZUZUZU = 27 00 -SE_RU_GASHIN = 28 00 -SE_RU_GASYAN = 29 00 -SE_RU_BARI = 2A 00 -SE_RU_HYUU = 2B 00 -SE_KI_GASYAN = 2C 00 -SE_TK_WARPIN = 2D 00 -SE_TK_WARPOUT = 2E 00 -SE_TU_SAA = 2F 00 -SE_HI_TURUN = 30 00 -SE_TRACK_MOVE = 31 00 -SE_TRACK_STOP = 32 00 -SE_TRACK_HAIKI = 33 00 -SE_TRACK_DOOR = 34 00 -SE_MOTER = 35 00 +SE_CONTEST_CONDITION_LOSE = 26 00 +SE_LAVARIDGE_FALL_WARP = 27 00 +SE_ICE_STAIRS = 28 00 +SE_ICE_BREAK = 29 00 +SE_ICE_CRACK = 2A 00 +SE_FALL = 2B 00 +SE_UNLOCK = 2C 00 +SE_WARP_IN = 2D 00 +SE_WARP_OUT = 2E 00 +SE_REPEL = 2F 00 +SE_ROTATING_GATE = 30 00 +SE_TRUCK_MOVE = 31 00 +SE_TRUCK_STOP = 32 00 +SE_TRUCK_UNLOAD = 33 00 +SE_TRUCK_DOOR = 34 00 +SE_BERRY_BLENDER = 35 00 SE_CARD = 36 00 SE_SAVE = 37 00 -SE_KON = 38 00 -SE_KON2 = 39 00 -SE_KON3 = 3A 00 -SE_KON4 = 3B 00 -SE_SUIKOMU = 3C 00 -SE_NAGERU = 3D 00 -SE_TOY_C = 3E 00 -SE_TOY_D = 3F 00 -SE_TOY_E = 40 00 -SE_TOY_F = 41 00 -SE_TOY_G = 42 00 -SE_TOY_A = 43 00 -SE_TOY_B = 44 00 -SE_TOY_C1 = 45 00 -SE_MIZU = 46 00 -SE_HASHI = 47 00 -SE_DAUGI = 48 00 -SE_PINPON = 49 00 -SE_FUUSEN1 = 4A 00 -SE_FUUSEN2 = 4B 00 -SE_FUUSEN3 = 4C 00 -SE_TOY_KABE = 4D 00 -SE_TOY_DANGO = 4E 00 -SE_DOKU = 4F 00 -SE_ESUKA = 50 00 -SE_T_AME = 51 00 -SE_T_AME_E = 52 00 -SE_T_OOAME = 53 00 -SE_T_OOAME_E = 54 00 -SE_T_KOAME = 55 00 -SE_T_KOAME_E = 56 00 -SE_T_KAMI = 57 00 -SE_T_KAMI2 = 58 00 -SE_ELEBETA = 59 00 -SE_HINSI = 5A 00 -SE_EXPMAX = 5B 00 -SE_TAMAKORO = 5C 00 -SE_TAMAKORO_E = 5D 00 -SE_BASABASA = 5E 00 -SE_REGI = 5F 00 -SE_C_GAJI = 60 00 -SE_C_MAKU_U = 61 00 -SE_C_MAKU_D = 62 00 -SE_C_PASI = 63 00 -SE_C_SYU = 64 00 -SE_C_PIKON = 65 00 -SE_REAPOKE = 66 00 -SE_OP_BASYU = 67 00 -SE_BT_START = 68 00 -SE_DENDOU = 69 00 -SE_JIHANKI = 6A 00 -SE_TAMA = 6B 00 -SE_Z_SCROLL = 6C 00 -SE_Z_PAGE = 6D 00 -SE_PN_ON = 6E 00 -SE_PN_OFF = 6F 00 -SE_Z_SEARCH = 70 00 -SE_TAMAGO = 71 00 -SE_TB_START = 72 00 -SE_TB_KON = 73 00 -SE_TB_KARA = 74 00 -SE_BIDORO = 75 00 -SE_W085 = 76 00 -SE_W085B = 77 00 -SE_W231 = 78 00 -SE_W171 = 79 00 -SE_W233 = 7A 00 -SE_W233B = 7B 00 -SE_W145 = 7C 00 -SE_W145B = 7D 00 -SE_W145C = 7E 00 -SE_W240 = 7F 00 -SE_W015 = 80 00 -SE_W081 = 81 00 -SE_W081B = 82 00 -SE_W088 = 83 00 -SE_W016 = 84 00 -SE_W016B = 85 00 -SE_W003 = 86 00 -SE_W104 = 87 00 -SE_W013 = 88 00 -SE_W196 = 89 00 -SE_W086 = 8A 00 -SE_W004 = 8B 00 -SE_W025 = 8C 00 -SE_W025B = 8D 00 -SE_W152 = 8E 00 -SE_W026 = 8F 00 -SE_W172 = 90 00 -SE_W172B = 91 00 -SE_W053 = 92 00 -SE_W007 = 93 00 -SE_W092 = 94 00 -SE_W221 = 95 00 -SE_W221B = 96 00 -SE_W052 = 97 00 -SE_W036 = 98 00 -SE_W059 = 99 00 -SE_W059B = 9A 00 -SE_W010 = 9B 00 -SE_W011 = 9C 00 -SE_W017 = 9D 00 -SE_W019 = 9E 00 -SE_W028 = 9F 00 -SE_W013B = A0 00 -SE_W044 = A1 00 -SE_W029 = A2 00 -SE_W057 = A3 00 -SE_W056 = A4 00 -SE_W250 = A5 00 -SE_W030 = A6 00 -SE_W039 = A7 00 -SE_W054 = A8 00 -SE_W077 = A9 00 -SE_W020 = AA 00 -SE_W082 = AB 00 -SE_W047 = AC 00 -SE_W195 = AD 00 -SE_W006 = AE 00 -SE_W091 = AF 00 -SE_W146 = B0 00 -SE_W120 = B1 00 -SE_W153 = B2 00 -SE_W071B = B3 00 -SE_W071 = B4 00 -SE_W103 = B5 00 -SE_W062 = B6 00 -SE_W062B = B7 00 -SE_W048 = B8 00 -SE_W187 = B9 00 -SE_W118 = BA 00 -SE_W155 = BB 00 -SE_W122 = BC 00 -SE_W060 = BD 00 -SE_W185 = BE 00 -SE_W014 = BF 00 -SE_W043 = C0 00 -SE_W207 = C1 00 -SE_W207B = C2 00 -SE_W215 = C3 00 -SE_W109 = C4 00 -SE_W173 = C5 00 -SE_W280 = C6 00 -SE_W202 = C7 00 -SE_W060B = C8 00 -SE_W076 = C9 00 -SE_W080 = CA 00 -SE_W100 = CB 00 -SE_W107 = CC 00 -SE_W166 = CD 00 -SE_W129 = CE 00 -SE_W115 = CF 00 -SE_W112 = D0 00 -SE_W197 = D1 00 -SE_W199 = D2 00 -SE_W236 = D3 00 -SE_W204 = D4 00 -SE_W268 = D5 00 -SE_W070 = D6 00 -SE_W063 = D7 00 -SE_W127 = D8 00 -SE_W179 = D9 00 -SE_W151 = DA 00 -SE_W201 = DB 00 -SE_W161 = DC 00 -SE_W161B = DD 00 -SE_W227 = DE 00 -SE_W227B = DF 00 -SE_W226 = E0 00 -SE_W208 = E1 00 -SE_W213 = E2 00 -SE_W213B = E3 00 -SE_W234 = E4 00 -SE_W260 = E5 00 -SE_W328 = E6 00 -SE_W320 = E7 00 -SE_W255 = E8 00 -SE_W291 = E9 00 -SE_W089 = EA 00 -SE_W239 = EB 00 -SE_W230 = EC 00 -SE_W281 = ED 00 -SE_W327 = EE 00 -SE_W287 = EF 00 -SE_W257 = F0 00 -SE_W253 = F1 00 -SE_W258 = F2 00 -SE_W322 = F3 00 -SE_W298 = F4 00 -SE_W287B = F5 00 -SE_W114 = F6 00 -SE_W063B = F7 00 -SE_RG_W_DOOR = F8 00 -SE_RG_CARD1 = F9 00 -SE_RG_CARD2 = FA 00 -SE_RG_CARD3 = FB 00 -SE_RG_BAG1 = FC 00 -SE_RG_BAG2 = FD 00 -SE_RG_GETTING = FE 00 +SE_BALL_BOUNCE_1 = 38 00 +SE_BALL_BOUNCE_2 = 39 00 +SE_BALL_BOUNCE_3 = 3A 00 +SE_BALL_BOUNCE_4 = 3B 00 +SE_BALL_TRADE = 3C 00 +SE_BALL_THROW = 3D 00 +SE_NOTE_C = 3E 00 +SE_NOTE_D = 3F 00 +SE_NOTE_E = 40 00 +SE_NOTE_F = 41 00 +SE_NOTE_G = 42 00 +SE_NOTE_A = 43 00 +SE_NOTE_B = 44 00 +SE_NOTE_C_HIGH = 45 00 +SE_PUDDLE = 46 00 +SE_BRIDGE_WALK = 47 00 +SE_ITEMFINDER = 48 00 +SE_DING_DONG = 49 00 +SE_BALLOON_RED = 4A 00 +SE_BALLOON_BLUE = 4B 00 +SE_BALLOON_YELLOW = 4C 00 +SE_BREAKABLE_DOOR = 4D 00 +SE_MUD_BALL = 4E 00 +SE_FIELD_POISON = 4F 00 +SE_ESCALATOR = 50 00 +SE_THUNDERSTORM = 51 00 +SE_THUNDERSTORM_STOP = 52 00 +SE_DOWNPOUR = 53 00 +SE_DOWNPOUR_STOP = 54 00 +SE_RAIN = 55 00 +SE_RAIN_STOP = 56 00 +SE_THUNDER = 57 00 +SE_THUNDER2 = 58 00 +SE_ELEVATOR = 59 00 +SE_LOW_HEALTH = 5A 00 +SE_EXP_MAX = 5B 00 +SE_ROULETTE_BALL = 5C 00 +SE_ROULETTE_BALL2 = 5D 00 +SE_TAILLOW_WING_FLAP = 5E 00 +SE_SHOP = 5F 00 +SE_CONTEST_HEART = 60 00 +SE_CONTEST_CURTAIN_RISE = 61 00 +SE_CONTEST_CURTAIN_FALL = 62 00 +SE_CONTEST_ICON_CHANGE = 63 00 +SE_CONTEST_ICON_CLEAR = 64 00 +SE_CONTEST_MONS_TURN = 65 00 +SE_SHINY = 66 00 +SE_INTRO_BLAST = 67 00 +SE_MUGSHOT = 68 00 +SE_APPLAUSE = 69 00 +SE_VEND = 6A 00 +SE_ORB = 6B 00 +SE_DEX_SCROLL = 6C 00 +SE_DEX_PAGE = 6D 00 +SE_POKENAV_ON = 6E 00 +SE_POKENAV_OFF = 6F 00 +SE_DEX_SEARCH = 70 00 +SE_EGG_HATCH = 71 00 +SE_BALL_TRAY_ENTER = 72 00 +SE_BALL_TRAY_BALL = 73 00 +SE_BALL_TRAY_EXIT = 74 00 +SE_GLASS_FLUTE = 75 00 +SE_M_THUNDERBOLT = 76 00 +SE_M_THUNDERBOLT2 = 77 00 +SE_M_HARDEN = 78 00 +SE_M_NIGHTMARE = 79 00 +SE_M_VITAL_THROW = 7A 00 +SE_M_VITAL_THROW2 = 7B 00 +SE_M_BUBBLE = 7C 00 +SE_M_BUBBLE2 = 7D 00 +SE_M_BUBBLE3 = 7E 00 +SE_M_RAIN_DANCE = 7F 00 +SE_M_CUT = 80 00 +SE_M_STRING_SHOT = 81 00 +SE_M_STRING_SHOT2 = 82 00 +SE_M_ROCK_THROW = 83 00 +SE_M_GUST = 84 00 +SE_M_GUST2 = 85 00 +SE_M_DOUBLE_SLAP = 86 00 +SE_M_DOUBLE_TEAM = 87 00 +SE_M_RAZOR_WIND = 88 00 +SE_M_ICY_WIND = 89 00 +SE_M_THUNDER_WAVE = 8A 00 +SE_M_COMET_PUNCH = 8B 00 +SE_M_MEGA_KICK = 8C 00 +SE_M_MEGA_KICK2 = 8D 00 +SE_M_CRABHAMMER = 8E 00 +SE_M_JUMP_KICK = 8F 00 +SE_M_FLAME_WHEEL = 90 00 +SE_M_FLAME_WHEEL2 = 91 00 +SE_M_FLAMETHROWER = 92 00 +SE_M_FIRE_PUNCH = 93 00 +SE_M_TOXIC = 94 00 +SE_M_SACRED_FIRE = 95 00 +SE_M_SACRED_FIRE2 = 96 00 +SE_M_EMBER = 97 00 +SE_M_TAKE_DOWN = 98 00 +SE_M_BLIZZARD = 99 00 +SE_M_BLIZZARD2 = 9A 00 +SE_M_SCRATCH = 9B 00 +SE_M_VICEGRIP = 9C 00 +SE_M_WING_ATTACK = 9D 00 +SE_M_FLY = 9E 00 +SE_M_SAND_ATTACK = 9F 00 +SE_M_RAZOR_WIND2 = A0 00 +SE_M_BITE = A1 00 +SE_M_HEADBUTT = A2 00 +SE_M_SURF = A3 00 +SE_M_HYDRO_PUMP = A4 00 +SE_M_WHIRLPOOL = A5 00 +SE_M_HORN_ATTACK = A6 00 +SE_M_TAIL_WHIP = A7 00 +SE_M_MIST = A8 00 +SE_M_POISON_POWDER = A9 00 +SE_M_BIND = AA 00 +SE_M_DRAGON_RAGE = AB 00 +SE_M_SING = AC 00 +SE_M_PERISH_SONG = AD 00 +SE_M_PAY_DAY = AE 00 +SE_M_DIG = AF 00 +SE_M_DIZZY_PUNCH = B0 00 +SE_M_SELF_DESTRUCT = B1 00 +SE_M_EXPLOSION = B2 00 +SE_M_ABSORB_2 = B3 00 +SE_M_ABSORB = B4 00 +SE_M_SCREECH = B5 00 +SE_M_BUBBLE_BEAM = B6 00 +SE_M_BUBBLE_BEAM2 = B7 00 +SE_M_SUPERSONIC = B8 00 +SE_M_BELLY_DRUM = B9 00 +SE_M_METRONOME = BA 00 +SE_M_BONEMERANG = BB 00 +SE_M_LICK = BC 00 +SE_M_PSYBEAM = BD 00 +SE_M_FAINT_ATTACK = BE 00 +SE_M_SWORDS_DANCE = BF 00 +SE_M_LEER = C0 00 +SE_M_SWAGGER = C1 00 +SE_M_SWAGGER2 = C2 00 +SE_M_HEAL_BELL = C3 00 +SE_M_CONFUSE_RAY = C4 00 +SE_M_SNORE = C5 00 +SE_M_BRICK_BREAK = C6 00 +SE_M_GIGA_DRAIN = C7 00 +SE_M_PSYBEAM2 = C8 00 +SE_M_SOLAR_BEAM = C9 00 +SE_M_PETAL_DANCE = CA 00 +SE_M_TELEPORT = CB 00 +SE_M_MINIMIZE = CC 00 +SE_M_SKETCH = CD 00 +SE_M_SWIFT = CE 00 +SE_M_REFLECT = CF 00 +SE_M_BARRIER = D0 00 +SE_M_DETECT = D1 00 +SE_M_LOCK_ON = D2 00 +SE_M_MOONLIGHT = D3 00 +SE_M_CHARM = D4 00 +SE_M_CHARGE = D5 00 +SE_M_STRENGTH = D6 00 +SE_M_HYPER_BEAM = D7 00 +SE_M_WATERFALL = D8 00 +SE_M_REVERSAL = D9 00 +SE_M_ACID_ARMOR = DA 00 +SE_M_SANDSTORM = DB 00 +SE_M_TRI_ATTACK = DC 00 +SE_M_TRI_ATTACK2 = DD 00 +SE_M_ENCORE = DE 00 +SE_M_ENCORE2 = DF 00 +SE_M_BATON_PASS = E0 00 +SE_M_MILK_DRINK = E1 00 +SE_M_ATTRACT = E2 00 +SE_M_ATTRACT2 = E3 00 +SE_M_MORNING_SUN = E4 00 +SE_M_FLATTER = E5 00 +SE_M_SAND_TOMB = E6 00 +SE_M_GRASSWHISTLE = E7 00 +SE_M_SPIT_UP = E8 00 +SE_M_DIVE = E9 00 +SE_M_EARTHQUAKE = EA 00 +SE_M_TWISTER = EB 00 +SE_M_SWEET_SCENT = EC 00 +SE_M_YAWN = ED 00 +SE_M_SKY_UPPERCUT = EE 00 +SE_M_STAT_INCREASE = EF 00 +SE_M_HEAT_WAVE = F0 00 +SE_M_UPROAR = F1 00 +SE_M_HAIL = F2 00 +SE_M_COSMIC_POWER = F3 00 +SE_M_TEETER_DANCE = F4 00 +SE_M_STAT_DECREASE = F5 00 +SE_M_HAZE = F6 00 +SE_M_HYPER_BEAM2 = F7 00 +SE_RG_DOOR = F8 00 +SE_RG_CARD_FLIP = F9 00 +SE_RG_CARD_FLIPPING = FA 00 +SE_RG_CARD_OPEN = FB 00 +SE_RG_BAG_CURSOR = FC 00 +SE_RG_BAG_POCKET = FD 00 +SE_RG_BALL_CLICK = FE 00 SE_RG_SHOP = FF 00 -SE_RG_KITEKI = 00 01 -SE_RG_HELP_OP = 01 01 -SE_RG_HELP_CL = 02 01 -SE_RG_HELP_NG = 03 01 -SE_RG_DEOMOV = 04 01 -SE_RG_EXCELLENT = 05 01 -SE_RG_NAWAMISS = 06 01 -SE_TOREEYE = 07 01 -SE_TOREOFF = 08 01 -SE_HANTEI1 = 09 01 -SE_HANTEI2 = 0A 01 -SE_CURTAIN = 0B 01 -SE_CURTAIN1 = 0C 01 -SE_USSOKI = 0D 01 -MUS_TETSUJI = 5E 01 -MUS_FIELD13 = 5F 01 -MUS_KACHI22 = 60 01 -MUS_KACHI2 = 61 01 -MUS_KACHI3 = 62 01 -MUS_KACHI5 = 63 01 -MUS_PCC = 64 01 -MUS_NIBI = 65 01 -MUS_SUIKUN = 66 01 -MUS_DOORO1 = 67 01 -MUS_DOORO_X1 = 68 01 -MUS_DOORO_X3 = 69 01 -MUS_MACHI_S2 = 6A 01 -MUS_MACHI_S4 = 6B 01 -MUS_GIM = 6C 01 -MUS_NAMINORI = 6D 01 -MUS_DAN01 = 6E 01 -MUS_FANFA1 = 6F 01 -MUS_ME_ASA = 70 01 -MUS_ME_BACHI = 71 01 -MUS_FANFA4 = 72 01 -MUS_FANFA5 = 73 01 -MUS_ME_WAZA = 74 01 -MUS_BIJYUTU = 75 01 -MUS_DOORO_X4 = 76 01 -MUS_FUNE_KAN = 77 01 -MUS_ME_SHINKA = 78 01 -MUS_SHINKA = 79 01 -MUS_ME_WASURE = 7A 01 -MUS_SYOUJOEYE = 7B 01 -MUS_BOYEYE = 7C 01 -MUS_DAN02 = 7D 01 -MUS_MACHI_S3 = 7E 01 -MUS_ODAMAKI = 7F 01 -MUS_B_TOWER = 80 01 -MUS_SWIMEYE = 81 01 -MUS_DAN03 = 82 01 -MUS_ME_KINOMI = 83 01 -MUS_ME_TAMA = 84 01 -MUS_ME_B_BIG = 85 01 -MUS_ME_B_SMALL = 86 01 -MUS_ME_ZANNEN = 87 01 -MUS_BD_TIME = 88 01 -MUS_TEST1 = 89 01 -MUS_TEST2 = 8A 01 -MUS_TEST3 = 8B 01 -MUS_TEST4 = 8C 01 -MUS_TEST = 8D 01 -MUS_GOMACHI0 = 8E 01 -MUS_GOTOWN = 8F 01 -MUS_POKECEN = 90 01 -MUS_NEXTROAD = 91 01 -MUS_GRANROAD = 92 01 +SE_RG_SS_ANNE_HORN = 00 01 +SE_RG_HELP_OPEN = 01 01 +SE_RG_HELP_CLOSE = 02 01 +SE_RG_HELP_ERROR = 03 01 +SE_RG_DEOXYS_MOVE = 04 01 +SE_RG_POKE_JUMP_SUCCESS = 05 01 +SE_RG_POKE_JUMP_FAILURE = 06 01 +SE_POKENAV_CALL = 07 01 +SE_POKENAV_HANG_UP = 08 01 +SE_ARENA_TIMEUP1 = 09 01 +SE_ARENA_TIMEUP2 = 0A 01 +SE_PIKE_CURTAIN_CLOSE = 0B 01 +SE_PIKE_CURTAIN_OPEN = 0C 01 +SE_SUDOWOODO_SHAKE = 0D 01 +MUS_LITTLEROOT_TEST = 5E 01 +MUS_GSC_ROUTE38 = 5F 01 +MUS_CAUGHT = 60 01 +MUS_VICTORY_WILD = 61 01 +MUS_VICTORY_GYM_LEADER = 62 01 +MUS_VICTORY_LEAGUE = 63 01 +MUS_C_COMM_CENTER = 64 01 +MUS_GSC_PEWTER = 65 01 +MUS_C_VS_LEGEND_BEAST = 66 01 +MUS_ROUTE101 = 67 01 +MUS_ROUTE110 = 68 01 +MUS_ROUTE120 = 69 01 +MUS_PETALBURG = 6A 01 +MUS_OLDALE = 6B 01 +MUS_GYM = 6C 01 +MUS_SURF = 6D 01 +MUS_PETALBURG_WOODS = 6E 01 +MUS_LEVEL_UP = 6F 01 +MUS_HEAL = 70 01 +MUS_OBTAIN_BADGE = 71 01 +MUS_OBTAIN_ITEM = 72 01 +MUS_EVOLVED = 73 01 +MUS_OBTAIN_TMHM = 74 01 +MUS_LILYCOVE_MUSEUM = 75 01 +MUS_ROUTE122 = 76 01 +MUS_OCEANIC_MUSEUM = 77 01 +MUS_EVOLUTION_INTRO = 78 01 +MUS_EVOLUTION = 79 01 +MUS_MOVE_DELETED = 7A 01 +MUS_ENCOUNTER_GIRL = 7B 01 +MUS_ENCOUNTER_MALE = 7C 01 +MUS_ABANDONED_SHIP = 7D 01 +MUS_FORTREE = 7E 01 +MUS_BIRCH_LAB = 7F 01 +MUS_B_TOWER_RS = 80 01 +MUS_ENCOUNTER_SWIMMER = 81 01 +MUS_CAVE_OF_ORIGIN = 82 01 +MUS_OBTAIN_BERRY = 83 01 +MUS_AWAKEN_LEGEND = 84 01 +MUS_SLOTS_JACKPOT = 85 01 +MUS_SLOTS_WIN = 86 01 +MUS_TOO_BAD = 87 01 +MUS_ROULETTE = 88 01 +MUS_LINK_CONTEST_P1 = 89 01 +MUS_LINK_CONTEST_P2 = 8A 01 +MUS_LINK_CONTEST_P3 = 8B 01 +MUS_LINK_CONTEST_P4 = 8C 01 +MUS_ENCOUNTER_RICH = 8D 01 +MUS_VERDANTURF = 8E 01 +MUS_RUSTBORO = 8F 01 +MUS_POKE_CENTER = 90 01 +MUS_ROUTE104 = 91 01 +MUS_ROUTE119 = 92 01 MUS_CYCLING = 93 01 -MUS_FRIENDLY = 94 01 -MUS_MISHIRO = 95 01 -MUS_TOZAN = 96 01 -MUS_GIRLEYE = 97 01 -MUS_MINAMO = 98 01 -MUS_ASHROAD = 99 01 -MUS_EVENT0 = 9A 01 -MUS_DEEPDEEP = 9B 01 -MUS_KACHI1 = 9C 01 -MUS_TITLE3 = 9D 01 -MUS_DEMO1 = 9E 01 -MUS_GIRL_SUP = 9F 01 -MUS_HAGESHII = A0 01 -MUS_KAKKOII = A1 01 -MUS_KAZANBAI = A2 01 -MUS_AQA_0 = A3 01 -MUS_TSURETEK = A4 01 -MUS_BOY_SUP = A5 01 -MUS_RAINBOW = A6 01 -MUS_AYASII = A7 01 -MUS_KACHI4 = A8 01 -MUS_ROPEWAY = A9 01 -MUS_CASINO = AA 01 -MUS_HIGHTOWN = AB 01 -MUS_SAFARI = AC 01 -MUS_C_ROAD = AD 01 -MUS_AJITO = AE 01 -MUS_M_BOAT = AF 01 -MUS_M_DUNGON = B0 01 -MUS_FINECITY = B1 01 -MUS_MACHUPI = B2 01 -MUS_P_SCHOOL = B3 01 -MUS_DENDOU = B4 01 -MUS_TONEKUSA = B5 01 -MUS_MABOROSI = B6 01 -MUS_CON_FAN = B7 01 -MUS_CONTEST0 = B8 01 -MUS_MGM0 = B9 01 -MUS_T_BATTLE = BA 01 -MUS_OOAME = BB 01 -MUS_HIDERI = BC 01 -MUS_RUNECITY = BD 01 -MUS_CON_K = BE 01 -MUS_EIKOU_R = BF 01 -MUS_KARAKURI = C0 01 -MUS_HUTAGO = C1 01 -MUS_SITENNOU = C2 01 -MUS_YAMA_EYE = C3 01 -MUS_CONLOBBY = C4 01 -MUS_INTER_V = C5 01 -MUS_DAIGO = C6 01 -MUS_THANKFOR = C7 01 +MUS_POKE_MART = 94 01 +MUS_LITTLEROOT = 95 01 +MUS_MT_CHIMNEY = 96 01 +MUS_ENCOUNTER_FEMALE = 97 01 +MUS_LILYCOVE = 98 01 +MUS_ROUTE111 = 99 01 +MUS_HELP = 9A 01 +MUS_UNDERWATER = 9B 01 +MUS_VICTORY_TRAINER = 9C 01 +MUS_TITLE = 9D 01 +MUS_INTRO = 9E 01 +MUS_ENCOUNTER_MAY = 9F 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 +MUS_ROUTE113 = A2 01 +MUS_ENCOUNTER_AQUA = A3 01 +MUS_FOLLOW_ME = A4 01 +MUS_ENCOUNTER_BRENDAN = A5 01 +MUS_EVER_GRANDE = A6 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 +MUS_VICTORY_AQUA_MAGMA = A8 01 +MUS_CABLE_CAR = A9 01 +MUS_GAME_CORNER = AA 01 +MUS_DEWFORD = AB 01 +MUS_SAFARI_ZONE = AC 01 +MUS_VICTORY_ROAD = AD 01 +MUS_AQUA_MAGMA_HIDEOUT = AE 01 +MUS_SAILING = AF 01 +MUS_MT_PYRE = B0 01 +MUS_SLATEPORT = B1 01 +MUS_MT_PYRE_EXTERIOR = B2 01 +MUS_SCHOOL = B3 01 +MUS_HALL_OF_FAME = B4 01 +MUS_FALLARBOR = B5 01 +MUS_SEALED_CHAMBER = B6 01 +MUS_CONTEST_WINNER = B7 01 +MUS_CONTEST = B8 01 +MUS_ENCOUNTER_MAGMA = B9 01 +MUS_INTRO_BATTLE = BA 01 +MUS_ABNORMAL_WEATHER = BB 01 +MUS_WEATHER_GROUDON = BC 01 +MUS_SOOTOPOLIS = BD 01 +MUS_CONTEST_RESULTS = BE 01 +MUS_HALL_OF_FAME_ROOM = BF 01 +MUS_TRICK_HOUSE = C0 01 +MUS_ENCOUNTER_TWINS = C1 01 +MUS_ENCOUNTER_ELITE_FOUR = C2 01 +MUS_ENCOUNTER_HIKER = C3 01 +MUS_CONTEST_LOBBY = C4 01 +MUS_ENCOUNTER_INTERVIEWER = C5 01 +MUS_ENCOUNTER_CHAMPION = C6 01 +MUS_CREDITS = C7 01 MUS_END = C8 01 MUS_B_FRONTIER = C9 01 MUS_B_ARENA = CA 01 -MUS_ME_POINTGET = CB 01 -MUS_ME_TORE_EYE = CC 01 -MUS_PYRAMID = CD 01 -MUS_PYRAMID_TOP = CE 01 +MUS_OBTAIN_B_POINTS = CB 01 +MUS_REGISTER_MATCH_CALL = CC 01 +MUS_B_PYRAMID = CD 01 +MUS_B_PYRAMID_TOP = CE 01 MUS_B_PALACE = CF 01 -MUS_REKKUU_KOURIN = D0 01 -MUS_SATTOWER = D1 01 -MUS_ME_SYMBOLGET = D2 01 +MUS_RAYQUAZA_APPEARS = D0 01 +MUS_B_TOWER = D1 01 +MUS_OBTAIN_SYMBOL = D2 01 MUS_B_DOME = D3 01 -MUS_B_TUBE = D4 01 +MUS_B_PIKE = D4 01 MUS_B_FACTORY = D5 01 -MUS_VS_REKKU = D6 01 -MUS_VS_FRONT = D7 01 +MUS_VS_RAYQUAZA = D6 01 +MUS_VS_FRONTIER_BRAIN = D7 01 MUS_VS_MEW = D8 01 -MUS_B_DOME1 = D9 01 -MUS_BATTLE27 = DA 01 -MUS_BATTLE31 = DB 01 -MUS_BATTLE20 = DC 01 -MUS_BATTLE32 = DD 01 -MUS_BATTLE33 = DE 01 -MUS_BATTLE36 = DF 01 -MUS_BATTLE34 = E0 01 -MUS_BATTLE35 = E1 01 -MUS_BATTLE38 = E2 01 -MUS_BATTLE30 = E3 01 -MUS_RG_ANNAI = E4 01 -MUS_RG_SLOT = E5 01 -MUS_RG_AJITO = E6 01 +MUS_B_DOME_LOBBY = D9 01 +MUS_VS_WILD = DA 01 +MUS_VS_AQUA_MAGMA = DB 01 +MUS_VS_TRAINER = DC 01 +MUS_VS_GYM_LEADER = DD 01 +MUS_VS_CHAMPION = DE 01 +MUS_VS_REGI = DF 01 +MUS_VS_KYOGRE_GROUDON = E0 01 +MUS_VS_RIVAL = E1 01 +MUS_VS_ELITE_FOUR = E2 01 +MUS_VS_AQUA_MAGMA_LEADER = E3 01 +MUS_RG_FOLLOW_ME = E4 01 +MUS_RG_GAME_CORNER = E5 01 +MUS_RG_ROCKET_HIDEOUT = E6 01 MUS_RG_GYM = E7 01 -MUS_RG_PURIN = E8 01 -MUS_RG_DEMO = E9 01 +MUS_RG_JIGGLYPUFF = E8 01 +MUS_RG_INTRO_FIGHT = E9 01 MUS_RG_TITLE = EA 01 -MUS_RG_GUREN = EB 01 -MUS_RG_SHION = EC 01 -MUS_RG_KAIHUKU = ED 01 +MUS_RG_CINNABAR = EB 01 +MUS_RG_LAVENDER = EC 01 +MUS_RG_HEAL = ED 01 MUS_RG_CYCLING = EE 01 -MUS_RG_ROCKET = EF 01 -MUS_RG_SHOUJO = F0 01 -MUS_RG_SHOUNEN = F1 01 -MUS_RG_DENDOU = F2 01 -MUS_RG_T_MORI = F3 01 -MUS_RG_OTSUKIMI = F4 01 -MUS_RG_POKEYASHI = F5 01 -MUS_RG_ENDING = F6 01 -MUS_RG_LOAD01 = F7 01 -MUS_RG_OPENING = F8 01 -MUS_RG_LOAD02 = F9 01 -MUS_RG_LOAD03 = FA 01 -MUS_RG_CHAMP_R = FB 01 -MUS_RG_VS_GYM = FC 01 -MUS_RG_VS_TORE = FD 01 -MUS_RG_VS_YASEI = FE 01 -MUS_RG_VS_LAST = FF 01 -MUS_RG_MASARA = 00 02 -MUS_RG_KENKYU = 01 02 -MUS_RG_OHKIDO = 02 02 -MUS_RG_POKECEN = 03 02 -MUS_RG_SANTOAN = 04 02 -MUS_RG_NAMINORI = 05 02 -MUS_RG_P_TOWER = 06 02 -MUS_RG_SHIRUHU = 07 02 -MUS_RG_HANADA = 08 02 -MUS_RG_TAMAMUSI = 09 02 -MUS_RG_WIN_TRE = 0A 02 -MUS_RG_WIN_YASEI = 0B 02 -MUS_RG_WIN_GYM = 0C 02 -MUS_RG_KUCHIBA = 0D 02 -MUS_RG_NIBI = 0E 02 -MUS_RG_RIVAL1 = 0F 02 -MUS_RG_RIVAL2 = 10 02 -MUS_RG_FAN2 = 11 02 -MUS_RG_FAN5 = 12 02 -MUS_RG_FAN6 = 13 02 -MUS_ME_RG_PHOTO = 14 02 -MUS_RG_TITLEROG = 15 02 -MUS_RG_GET_YASEI = 16 02 -MUS_RG_SOUSA = 17 02 -MUS_RG_SEKAIKAN = 18 02 -MUS_RG_SEIBETU = 19 02 -MUS_RG_JUMP = 1A 02 -MUS_RG_UNION = 1B 02 -MUS_RG_NETWORK = 1C 02 -MUS_RG_OKURIMONO = 1D 02 -MUS_RG_KINOMIKUI = 1E 02 -MUS_RG_NANADUNGEON = 1F 02 -MUS_RG_OSHIE_TV = 20 02 -MUS_RG_NANASHIMA = 21 02 -MUS_RG_NANAISEKI = 22 02 -MUS_RG_NANA123 = 23 02 -MUS_RG_NANA45 = 24 02 -MUS_RG_NANA67 = 25 02 -MUS_RG_POKEFUE = 26 02 -MUS_RG_VS_DEO = 27 02 -MUS_RG_VS_MYU2 = 28 02 -MUS_RG_VS_DEN = 29 02 -MUS_RG_EXEYE = 2A 02 -MUS_RG_DEOEYE = 2B 02 -MUS_RG_T_TOWER = 2C 02 -MUS_RG_SLOWMASARA = 2D 02 -MUS_RG_TVNOIZE = 2E 02 +MUS_RG_ENCOUNTER_ROCKET = EF 01 +MUS_RG_ENCOUNTER_GIRL = F0 01 +MUS_RG_ENCOUNTER_BOY = F1 01 +MUS_RG_HALL_OF_FAME = F2 01 +MUS_RG_VIRIDIAN_FOREST = F3 01 +MUS_RG_MT_MOON = F4 01 +MUS_RG_POKE_MANSION = F5 01 +MUS_RG_CREDITS = F6 01 +MUS_RG_ROUTE1 = F7 01 +MUS_RG_ROUTE24 = F8 01 +MUS_RG_ROUTE3 = F9 01 +MUS_RG_ROUTE11 = FA 01 +MUS_RG_VICTORY_ROAD = FB 01 +MUS_RG_VS_GYM_LEADER = FC 01 +MUS_RG_VS_TRAINER = FD 01 +MUS_RG_VS_WILD = FE 01 +MUS_RG_VS_CHAMPION = FF 01 +MUS_RG_PALLET = 00 02 +MUS_RG_OAK_LAB = 01 02 +MUS_RG_OAK = 02 02 +MUS_RG_POKE_CENTER = 03 02 +MUS_RG_SS_ANNE = 04 02 +MUS_RG_SURF = 05 02 +MUS_RG_POKE_TOWER = 06 02 +MUS_RG_SILPH = 07 02 +MUS_RG_FUCHSIA = 08 02 +MUS_RG_CELADON = 09 02 +MUS_RG_VICTORY_TRAINER = 0A 02 +MUS_RG_VICTORY_WILD = 0B 02 +MUS_RG_VICTORY_GYM_LEADER = 0C 02 +MUS_RG_VERMILLION = 0D 02 +MUS_RG_PEWTER = 0E 02 +MUS_RG_ENCOUNTER_RIVAL = 0F 02 +MUS_RG_RIVAL_EXIT = 10 02 +MUS_RG_DEX_RATING = 11 02 +MUS_RG_OBTAIN_KEY_ITEM = 12 02 +MUS_RG_CAUGHT_INTRO = 13 02 +MUS_RG_PHOTO = 14 02 +MUS_RG_GAME_FREAK = 15 02 +MUS_RG_CAUGHT = 16 02 +MUS_RG_NEW_GAME_INSTRUCT = 17 02 +MUS_RG_NEW_GAME_INTRO = 18 02 +MUS_RG_NEW_GAME_EXIT = 19 02 +MUS_RG_POKE_JUMP = 1A 02 +MUS_RG_UNION_ROOM = 1B 02 +MUS_RG_NET_CENTER = 1C 02 +MUS_RG_MYSTERY_GIFT = 1D 02 +MUS_RG_BERRY_PICK = 1E 02 +MUS_RG_SEVII_CAVE = 1F 02 +MUS_RG_TEACHY_TV_SHOW = 20 02 +MUS_RG_SEVII_ROUTE = 21 02 +MUS_RG_SEVII_DUNGEON = 22 02 +MUS_RG_SEVII_123 = 23 02 +MUS_RG_SEVII_45 = 24 02 +MUS_RG_SEVII_67 = 25 02 +MUS_RG_POKE_FLUTE = 26 02 +MUS_RG_VS_DEOXYS = 27 02 +MUS_RG_VS_MEWTWO = 28 02 +MUS_RG_VS_LEGEND = 29 02 +MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02 +MUS_RG_ENCOUNTER_DEOXYS = 2B 02 +MUS_RG_TRAINER_TOWER = 2C 02 +MUS_RG_SLOW_PALLET = 2D 02 +MUS_RG_TEACHY_TV_MENU = 2E 02 PH_TRAP_BLEND = 2F 02 PH_TRAP_HELD = 30 02 PH_TRAP_SOLO = 31 02 diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt index 94eabe8bce..09427dc8dc 100644 --- a/berry_fix/payload/charmap.txt +++ b/berry_fix/payload/charmap.txt @@ -454,7 +454,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean @ sound and music MUS_DUMMY = 00 00 -SE_KAIFUKU = 01 00 +SE_USE_ITEM = 01 00 SE_PC_LOGIN = 02 00 SE_PC_OFF = 03 00 SE_PC_ON = 04 00 @@ -462,476 +462,476 @@ SE_SELECT = 05 00 SE_WIN_OPEN = 06 00 SE_WALL_HIT = 07 00 SE_DOOR = 08 00 -SE_KAIDAN = 09 00 -SE_DANSA = 0A 00 -SE_JITENSYA = 0B 00 -SE_KOUKA_L = 0C 00 -SE_KOUKA_M = 0D 00 -SE_KOUKA_H = 0E 00 -SE_BOWA2 = 0F 00 -SE_POKE_DEAD = 10 00 -SE_NIGERU = 11 00 -SE_JIDO_DOA = 12 00 -SE_NAMINORI = 13 00 -SE_BAN = 14 00 +SE_EXIT = 09 00 +SE_LEDGE = 0A 00 +SE_BIKE_BELL = 0B 00 +SE_NOT_EFFECTIVE = 0C 00 +SE_EFFECTIVE = 0D 00 +SE_SUPER_EFFECTIVE = 0E 00 +SE_BALL_OPEN = 0F 00 +SE_FAINT = 10 00 +SE_FLEE = 11 00 +SE_SLIDING_DOOR = 12 00 +SE_SHIP = 13 00 +SE_BANG = 14 00 SE_PIN = 15 00 SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 +SE_BALL = 17 00 +SE_CONTEST_PLACE = 18 00 SE_A = 19 00 SE_I = 1A 00 SE_U = 1B 00 SE_E = 1C 00 SE_O = 1D 00 SE_N = 1E 00 -SE_SEIKAI = 1F 00 -SE_HAZURE = 20 00 +SE_SUCCESS = 1F 00 +SE_FAILURE = 20 00 SE_EXP = 21 00 -SE_JITE_PYOKO = 22 00 -SE_MU_PACHI = 23 00 -SE_TK_KASYA = 24 00 +SE_BIKE_HOP = 22 00 +SE_SWITCH = 23 00 +SE_CLICK = 24 00 SE_FU_ZAKU = 25 00 -SE_FU_ZAKU2 = 26 00 -SE_FU_ZUZUZU = 27 00 -SE_RU_GASHIN = 28 00 -SE_RU_GASYAN = 29 00 -SE_RU_BARI = 2A 00 -SE_RU_HYUU = 2B 00 -SE_KI_GASYAN = 2C 00 -SE_TK_WARPIN = 2D 00 -SE_TK_WARPOUT = 2E 00 -SE_TU_SAA = 2F 00 -SE_HI_TURUN = 30 00 -SE_TRACK_MOVE = 31 00 -SE_TRACK_STOP = 32 00 -SE_TRACK_HAIKI = 33 00 -SE_TRACK_DOOR = 34 00 -SE_MOTER = 35 00 +SE_CONTEST_CONDITION_LOSE = 26 00 +SE_LAVARIDGE_FALL_WARP = 27 00 +SE_ICE_STAIRS = 28 00 +SE_ICE_BREAK = 29 00 +SE_ICE_CRACK = 2A 00 +SE_FALL = 2B 00 +SE_UNLOCK = 2C 00 +SE_WARP_IN = 2D 00 +SE_WARP_OUT = 2E 00 +SE_REPEL = 2F 00 +SE_ROTATING_GATE = 30 00 +SE_TRUCK_MOVE = 31 00 +SE_TRUCK_STOP = 32 00 +SE_TRUCK_UNLOAD = 33 00 +SE_TRUCK_DOOR = 34 00 +SE_BERRY_BLENDER = 35 00 SE_CARD = 36 00 SE_SAVE = 37 00 -SE_KON = 38 00 -SE_KON2 = 39 00 -SE_KON3 = 3A 00 -SE_KON4 = 3B 00 -SE_SUIKOMU = 3C 00 -SE_NAGERU = 3D 00 -SE_TOY_C = 3E 00 -SE_TOY_D = 3F 00 -SE_TOY_E = 40 00 -SE_TOY_F = 41 00 -SE_TOY_G = 42 00 -SE_TOY_A = 43 00 -SE_TOY_B = 44 00 -SE_TOY_C1 = 45 00 -SE_MIZU = 46 00 -SE_HASHI = 47 00 -SE_DAUGI = 48 00 -SE_PINPON = 49 00 -SE_FUUSEN1 = 4A 00 -SE_FUUSEN2 = 4B 00 -SE_FUUSEN3 = 4C 00 -SE_TOY_KABE = 4D 00 -SE_TOY_DANGO = 4E 00 -SE_DOKU = 4F 00 -SE_ESUKA = 50 00 -SE_T_AME = 51 00 -SE_T_AME_E = 52 00 -SE_T_OOAME = 53 00 -SE_T_OOAME_E = 54 00 -SE_T_KOAME = 55 00 -SE_T_KOAME_E = 56 00 -SE_T_KAMI = 57 00 -SE_T_KAMI2 = 58 00 -SE_ELEBETA = 59 00 -SE_HINSI = 5A 00 -SE_EXPMAX = 5B 00 -SE_TAMAKORO = 5C 00 -SE_TAMAKORO_E = 5D 00 -SE_BASABASA = 5E 00 -SE_REGI = 5F 00 -SE_C_GAJI = 60 00 -SE_C_MAKU_U = 61 00 -SE_C_MAKU_D = 62 00 -SE_C_PASI = 63 00 -SE_C_SYU = 64 00 -SE_C_PIKON = 65 00 -SE_REAPOKE = 66 00 -SE_OP_BASYU = 67 00 -SE_BT_START = 68 00 -SE_DENDOU = 69 00 -SE_JIHANKI = 6A 00 -SE_TAMA = 6B 00 -SE_Z_SCROLL = 6C 00 -SE_Z_PAGE = 6D 00 -SE_PN_ON = 6E 00 -SE_PN_OFF = 6F 00 -SE_Z_SEARCH = 70 00 -SE_TAMAGO = 71 00 -SE_TB_START = 72 00 -SE_TB_KON = 73 00 -SE_TB_KARA = 74 00 -SE_BIDORO = 75 00 -SE_W085 = 76 00 -SE_W085B = 77 00 -SE_W231 = 78 00 -SE_W171 = 79 00 -SE_W233 = 7A 00 -SE_W233B = 7B 00 -SE_W145 = 7C 00 -SE_W145B = 7D 00 -SE_W145C = 7E 00 -SE_W240 = 7F 00 -SE_W015 = 80 00 -SE_W081 = 81 00 -SE_W081B = 82 00 -SE_W088 = 83 00 -SE_W016 = 84 00 -SE_W016B = 85 00 -SE_W003 = 86 00 -SE_W104 = 87 00 -SE_W013 = 88 00 -SE_W196 = 89 00 -SE_W086 = 8A 00 -SE_W004 = 8B 00 -SE_W025 = 8C 00 -SE_W025B = 8D 00 -SE_W152 = 8E 00 -SE_W026 = 8F 00 -SE_W172 = 90 00 -SE_W172B = 91 00 -SE_W053 = 92 00 -SE_W007 = 93 00 -SE_W092 = 94 00 -SE_W221 = 95 00 -SE_W221B = 96 00 -SE_W052 = 97 00 -SE_W036 = 98 00 -SE_W059 = 99 00 -SE_W059B = 9A 00 -SE_W010 = 9B 00 -SE_W011 = 9C 00 -SE_W017 = 9D 00 -SE_W019 = 9E 00 -SE_W028 = 9F 00 -SE_W013B = A0 00 -SE_W044 = A1 00 -SE_W029 = A2 00 -SE_W057 = A3 00 -SE_W056 = A4 00 -SE_W250 = A5 00 -SE_W030 = A6 00 -SE_W039 = A7 00 -SE_W054 = A8 00 -SE_W077 = A9 00 -SE_W020 = AA 00 -SE_W082 = AB 00 -SE_W047 = AC 00 -SE_W195 = AD 00 -SE_W006 = AE 00 -SE_W091 = AF 00 -SE_W146 = B0 00 -SE_W120 = B1 00 -SE_W153 = B2 00 -SE_W071B = B3 00 -SE_W071 = B4 00 -SE_W103 = B5 00 -SE_W062 = B6 00 -SE_W062B = B7 00 -SE_W048 = B8 00 -SE_W187 = B9 00 -SE_W118 = BA 00 -SE_W155 = BB 00 -SE_W122 = BC 00 -SE_W060 = BD 00 -SE_W185 = BE 00 -SE_W014 = BF 00 -SE_W043 = C0 00 -SE_W207 = C1 00 -SE_W207B = C2 00 -SE_W215 = C3 00 -SE_W109 = C4 00 -SE_W173 = C5 00 -SE_W280 = C6 00 -SE_W202 = C7 00 -SE_W060B = C8 00 -SE_W076 = C9 00 -SE_W080 = CA 00 -SE_W100 = CB 00 -SE_W107 = CC 00 -SE_W166 = CD 00 -SE_W129 = CE 00 -SE_W115 = CF 00 -SE_W112 = D0 00 -SE_W197 = D1 00 -SE_W199 = D2 00 -SE_W236 = D3 00 -SE_W204 = D4 00 -SE_W268 = D5 00 -SE_W070 = D6 00 -SE_W063 = D7 00 -SE_W127 = D8 00 -SE_W179 = D9 00 -SE_W151 = DA 00 -SE_W201 = DB 00 -SE_W161 = DC 00 -SE_W161B = DD 00 -SE_W227 = DE 00 -SE_W227B = DF 00 -SE_W226 = E0 00 -SE_W208 = E1 00 -SE_W213 = E2 00 -SE_W213B = E3 00 -SE_W234 = E4 00 -SE_W260 = E5 00 -SE_W328 = E6 00 -SE_W320 = E7 00 -SE_W255 = E8 00 -SE_W291 = E9 00 -SE_W089 = EA 00 -SE_W239 = EB 00 -SE_W230 = EC 00 -SE_W281 = ED 00 -SE_W327 = EE 00 -SE_W287 = EF 00 -SE_W257 = F0 00 -SE_W253 = F1 00 -SE_W258 = F2 00 -SE_W322 = F3 00 -SE_W298 = F4 00 -SE_W287B = F5 00 -SE_W114 = F6 00 -SE_W063B = F7 00 -SE_RG_W_DOOR = F8 00 -SE_RG_CARD1 = F9 00 -SE_RG_CARD2 = FA 00 -SE_RG_CARD3 = FB 00 -SE_RG_BAG1 = FC 00 -SE_RG_BAG2 = FD 00 -SE_RG_GETTING = FE 00 +SE_BALL_BOUNCE_1 = 38 00 +SE_BALL_BOUNCE_2 = 39 00 +SE_BALL_BOUNCE_3 = 3A 00 +SE_BALL_BOUNCE_4 = 3B 00 +SE_BALL_TRADE = 3C 00 +SE_BALL_THROW = 3D 00 +SE_NOTE_C = 3E 00 +SE_NOTE_D = 3F 00 +SE_NOTE_E = 40 00 +SE_NOTE_F = 41 00 +SE_NOTE_G = 42 00 +SE_NOTE_A = 43 00 +SE_NOTE_B = 44 00 +SE_NOTE_C_HIGH = 45 00 +SE_PUDDLE = 46 00 +SE_BRIDGE_WALK = 47 00 +SE_ITEMFINDER = 48 00 +SE_DING_DONG = 49 00 +SE_BALLOON_RED = 4A 00 +SE_BALLOON_BLUE = 4B 00 +SE_BALLOON_YELLOW = 4C 00 +SE_BREAKABLE_DOOR = 4D 00 +SE_MUD_BALL = 4E 00 +SE_FIELD_POISON = 4F 00 +SE_ESCALATOR = 50 00 +SE_THUNDERSTORM = 51 00 +SE_THUNDERSTORM_STOP = 52 00 +SE_DOWNPOUR = 53 00 +SE_DOWNPOUR_STOP = 54 00 +SE_RAIN = 55 00 +SE_RAIN_STOP = 56 00 +SE_THUNDER = 57 00 +SE_THUNDER2 = 58 00 +SE_ELEVATOR = 59 00 +SE_LOW_HEALTH = 5A 00 +SE_EXP_MAX = 5B 00 +SE_ROULETTE_BALL = 5C 00 +SE_ROULETTE_BALL2 = 5D 00 +SE_TAILLOW_WING_FLAP = 5E 00 +SE_SHOP = 5F 00 +SE_CONTEST_HEART = 60 00 +SE_CONTEST_CURTAIN_RISE = 61 00 +SE_CONTEST_CURTAIN_FALL = 62 00 +SE_CONTEST_ICON_CHANGE = 63 00 +SE_CONTEST_ICON_CLEAR = 64 00 +SE_CONTEST_MONS_TURN = 65 00 +SE_SHINY = 66 00 +SE_INTRO_BLAST = 67 00 +SE_MUGSHOT = 68 00 +SE_APPLAUSE = 69 00 +SE_VEND = 6A 00 +SE_ORB = 6B 00 +SE_DEX_SCROLL = 6C 00 +SE_DEX_PAGE = 6D 00 +SE_POKENAV_ON = 6E 00 +SE_POKENAV_OFF = 6F 00 +SE_DEX_SEARCH = 70 00 +SE_EGG_HATCH = 71 00 +SE_BALL_TRAY_ENTER = 72 00 +SE_BALL_TRAY_BALL = 73 00 +SE_BALL_TRAY_EXIT = 74 00 +SE_GLASS_FLUTE = 75 00 +SE_M_THUNDERBOLT = 76 00 +SE_M_THUNDERBOLT2 = 77 00 +SE_M_HARDEN = 78 00 +SE_M_NIGHTMARE = 79 00 +SE_M_VITAL_THROW = 7A 00 +SE_M_VITAL_THROW2 = 7B 00 +SE_M_BUBBLE = 7C 00 +SE_M_BUBBLE2 = 7D 00 +SE_M_BUBBLE3 = 7E 00 +SE_M_RAIN_DANCE = 7F 00 +SE_M_CUT = 80 00 +SE_M_STRING_SHOT = 81 00 +SE_M_STRING_SHOT2 = 82 00 +SE_M_ROCK_THROW = 83 00 +SE_M_GUST = 84 00 +SE_M_GUST2 = 85 00 +SE_M_DOUBLE_SLAP = 86 00 +SE_M_DOUBLE_TEAM = 87 00 +SE_M_RAZOR_WIND = 88 00 +SE_M_ICY_WIND = 89 00 +SE_M_THUNDER_WAVE = 8A 00 +SE_M_COMET_PUNCH = 8B 00 +SE_M_MEGA_KICK = 8C 00 +SE_M_MEGA_KICK2 = 8D 00 +SE_M_CRABHAMMER = 8E 00 +SE_M_JUMP_KICK = 8F 00 +SE_M_FLAME_WHEEL = 90 00 +SE_M_FLAME_WHEEL2 = 91 00 +SE_M_FLAMETHROWER = 92 00 +SE_M_FIRE_PUNCH = 93 00 +SE_M_TOXIC = 94 00 +SE_M_SACRED_FIRE = 95 00 +SE_M_SACRED_FIRE2 = 96 00 +SE_M_EMBER = 97 00 +SE_M_TAKE_DOWN = 98 00 +SE_M_BLIZZARD = 99 00 +SE_M_BLIZZARD2 = 9A 00 +SE_M_SCRATCH = 9B 00 +SE_M_VICEGRIP = 9C 00 +SE_M_WING_ATTACK = 9D 00 +SE_M_FLY = 9E 00 +SE_M_SAND_ATTACK = 9F 00 +SE_M_RAZOR_WIND2 = A0 00 +SE_M_BITE = A1 00 +SE_M_HEADBUTT = A2 00 +SE_M_SURF = A3 00 +SE_M_HYDRO_PUMP = A4 00 +SE_M_WHIRLPOOL = A5 00 +SE_M_HORN_ATTACK = A6 00 +SE_M_TAIL_WHIP = A7 00 +SE_M_MIST = A8 00 +SE_M_POISON_POWDER = A9 00 +SE_M_BIND = AA 00 +SE_M_DRAGON_RAGE = AB 00 +SE_M_SING = AC 00 +SE_M_PERISH_SONG = AD 00 +SE_M_PAY_DAY = AE 00 +SE_M_DIG = AF 00 +SE_M_DIZZY_PUNCH = B0 00 +SE_M_SELF_DESTRUCT = B1 00 +SE_M_EXPLOSION = B2 00 +SE_M_ABSORB_2 = B3 00 +SE_M_ABSORB = B4 00 +SE_M_SCREECH = B5 00 +SE_M_BUBBLE_BEAM = B6 00 +SE_M_BUBBLE_BEAM2 = B7 00 +SE_M_SUPERSONIC = B8 00 +SE_M_BELLY_DRUM = B9 00 +SE_M_METRONOME = BA 00 +SE_M_BONEMERANG = BB 00 +SE_M_LICK = BC 00 +SE_M_PSYBEAM = BD 00 +SE_M_FAINT_ATTACK = BE 00 +SE_M_SWORDS_DANCE = BF 00 +SE_M_LEER = C0 00 +SE_M_SWAGGER = C1 00 +SE_M_SWAGGER2 = C2 00 +SE_M_HEAL_BELL = C3 00 +SE_M_CONFUSE_RAY = C4 00 +SE_M_SNORE = C5 00 +SE_M_BRICK_BREAK = C6 00 +SE_M_GIGA_DRAIN = C7 00 +SE_M_PSYBEAM2 = C8 00 +SE_M_SOLAR_BEAM = C9 00 +SE_M_PETAL_DANCE = CA 00 +SE_M_TELEPORT = CB 00 +SE_M_MINIMIZE = CC 00 +SE_M_SKETCH = CD 00 +SE_M_SWIFT = CE 00 +SE_M_REFLECT = CF 00 +SE_M_BARRIER = D0 00 +SE_M_DETECT = D1 00 +SE_M_LOCK_ON = D2 00 +SE_M_MOONLIGHT = D3 00 +SE_M_CHARM = D4 00 +SE_M_CHARGE = D5 00 +SE_M_STRENGTH = D6 00 +SE_M_HYPER_BEAM = D7 00 +SE_M_WATERFALL = D8 00 +SE_M_REVERSAL = D9 00 +SE_M_ACID_ARMOR = DA 00 +SE_M_SANDSTORM = DB 00 +SE_M_TRI_ATTACK = DC 00 +SE_M_TRI_ATTACK2 = DD 00 +SE_M_ENCORE = DE 00 +SE_M_ENCORE2 = DF 00 +SE_M_BATON_PASS = E0 00 +SE_M_MILK_DRINK = E1 00 +SE_M_ATTRACT = E2 00 +SE_M_ATTRACT2 = E3 00 +SE_M_MORNING_SUN = E4 00 +SE_M_FLATTER = E5 00 +SE_M_SAND_TOMB = E6 00 +SE_M_GRASSWHISTLE = E7 00 +SE_M_SPIT_UP = E8 00 +SE_M_DIVE = E9 00 +SE_M_EARTHQUAKE = EA 00 +SE_M_TWISTER = EB 00 +SE_M_SWEET_SCENT = EC 00 +SE_M_YAWN = ED 00 +SE_M_SKY_UPPERCUT = EE 00 +SE_M_STAT_INCREASE = EF 00 +SE_M_HEAT_WAVE = F0 00 +SE_M_UPROAR = F1 00 +SE_M_HAIL = F2 00 +SE_M_COSMIC_POWER = F3 00 +SE_M_TEETER_DANCE = F4 00 +SE_M_STAT_DECREASE = F5 00 +SE_M_HAZE = F6 00 +SE_M_HYPER_BEAM2 = F7 00 +SE_RG_DOOR = F8 00 +SE_RG_CARD_FLIP = F9 00 +SE_RG_CARD_FLIPPING = FA 00 +SE_RG_CARD_OPEN = FB 00 +SE_RG_BAG_CURSOR = FC 00 +SE_RG_BAG_POCKET = FD 00 +SE_RG_BALL_CLICK = FE 00 SE_RG_SHOP = FF 00 -SE_RG_KITEKI = 00 01 -SE_RG_HELP_OP = 01 01 -SE_RG_HELP_CL = 02 01 -SE_RG_HELP_NG = 03 01 -SE_RG_DEOMOV = 04 01 -SE_RG_EXCELLENT = 05 01 -SE_RG_NAWAMISS = 06 01 -SE_TOREEYE = 07 01 -SE_TOREOFF = 08 01 -SE_HANTEI1 = 09 01 -SE_HANTEI2 = 0A 01 -SE_CURTAIN = 0B 01 -SE_CURTAIN1 = 0C 01 -SE_USSOKI = 0D 01 -MUS_TETSUJI = 5E 01 -MUS_FIELD13 = 5F 01 -MUS_KACHI22 = 60 01 -MUS_KACHI2 = 61 01 -MUS_KACHI3 = 62 01 -MUS_KACHI5 = 63 01 -MUS_PCC = 64 01 -MUS_NIBI = 65 01 -MUS_SUIKUN = 66 01 -MUS_DOORO1 = 67 01 -MUS_DOORO_X1 = 68 01 -MUS_DOORO_X3 = 69 01 -MUS_MACHI_S2 = 6A 01 -MUS_MACHI_S4 = 6B 01 -MUS_GIM = 6C 01 -MUS_NAMINORI = 6D 01 -MUS_DAN01 = 6E 01 -MUS_FANFA1 = 6F 01 -MUS_ME_ASA = 70 01 -MUS_ME_BACHI = 71 01 -MUS_FANFA4 = 72 01 -MUS_FANFA5 = 73 01 -MUS_ME_WAZA = 74 01 -MUS_BIJYUTU = 75 01 -MUS_DOORO_X4 = 76 01 -MUS_FUNE_KAN = 77 01 -MUS_ME_SHINKA = 78 01 -MUS_SHINKA = 79 01 -MUS_ME_WASURE = 7A 01 -MUS_SYOUJOEYE = 7B 01 -MUS_BOYEYE = 7C 01 -MUS_DAN02 = 7D 01 -MUS_MACHI_S3 = 7E 01 -MUS_ODAMAKI = 7F 01 -MUS_B_TOWER = 80 01 -MUS_SWIMEYE = 81 01 -MUS_DAN03 = 82 01 -MUS_ME_KINOMI = 83 01 -MUS_ME_TAMA = 84 01 -MUS_ME_B_BIG = 85 01 -MUS_ME_B_SMALL = 86 01 -MUS_ME_ZANNEN = 87 01 -MUS_BD_TIME = 88 01 -MUS_TEST1 = 89 01 -MUS_TEST2 = 8A 01 -MUS_TEST3 = 8B 01 -MUS_TEST4 = 8C 01 -MUS_TEST = 8D 01 -MUS_GOMACHI0 = 8E 01 -MUS_GOTOWN = 8F 01 -MUS_POKECEN = 90 01 -MUS_NEXTROAD = 91 01 -MUS_GRANROAD = 92 01 +SE_RG_SS_ANNE_HORN = 00 01 +SE_RG_HELP_OPEN = 01 01 +SE_RG_HELP_CLOSE = 02 01 +SE_RG_HELP_ERROR = 03 01 +SE_RG_DEOXYS_MOVE = 04 01 +SE_RG_POKE_JUMP_SUCCESS = 05 01 +SE_RG_POKE_JUMP_FAILURE = 06 01 +SE_POKENAV_CALL = 07 01 +SE_POKENAV_HANG_UP = 08 01 +SE_ARENA_TIMEUP1 = 09 01 +SE_ARENA_TIMEUP2 = 0A 01 +SE_PIKE_CURTAIN_CLOSE = 0B 01 +SE_PIKE_CURTAIN_OPEN = 0C 01 +SE_SUDOWOODO_SHAKE = 0D 01 +MUS_LITTLEROOT_TEST = 5E 01 +MUS_GSC_ROUTE38 = 5F 01 +MUS_CAUGHT = 60 01 +MUS_VICTORY_WILD = 61 01 +MUS_VICTORY_GYM_LEADER = 62 01 +MUS_VICTORY_LEAGUE = 63 01 +MUS_C_COMM_CENTER = 64 01 +MUS_GSC_PEWTER = 65 01 +MUS_C_VS_LEGEND_BEAST = 66 01 +MUS_ROUTE101 = 67 01 +MUS_ROUTE110 = 68 01 +MUS_ROUTE120 = 69 01 +MUS_PETALBURG = 6A 01 +MUS_OLDALE = 6B 01 +MUS_GYM = 6C 01 +MUS_SURF = 6D 01 +MUS_PETALBURG_WOODS = 6E 01 +MUS_LEVEL_UP = 6F 01 +MUS_HEAL = 70 01 +MUS_OBTAIN_BADGE = 71 01 +MUS_OBTAIN_ITEM = 72 01 +MUS_EVOLVED = 73 01 +MUS_OBTAIN_TMHM = 74 01 +MUS_LILYCOVE_MUSEUM = 75 01 +MUS_ROUTE122 = 76 01 +MUS_OCEANIC_MUSEUM = 77 01 +MUS_EVOLUTION_INTRO = 78 01 +MUS_EVOLUTION = 79 01 +MUS_MOVE_DELETED = 7A 01 +MUS_ENCOUNTER_GIRL = 7B 01 +MUS_ENCOUNTER_MALE = 7C 01 +MUS_ABANDONED_SHIP = 7D 01 +MUS_FORTREE = 7E 01 +MUS_BIRCH_LAB = 7F 01 +MUS_B_TOWER_RS = 80 01 +MUS_ENCOUNTER_SWIMMER = 81 01 +MUS_CAVE_OF_ORIGIN = 82 01 +MUS_OBTAIN_BERRY = 83 01 +MUS_AWAKEN_LEGEND = 84 01 +MUS_SLOTS_JACKPOT = 85 01 +MUS_SLOTS_WIN = 86 01 +MUS_TOO_BAD = 87 01 +MUS_ROULETTE = 88 01 +MUS_LINK_CONTEST_P1 = 89 01 +MUS_LINK_CONTEST_P2 = 8A 01 +MUS_LINK_CONTEST_P3 = 8B 01 +MUS_LINK_CONTEST_P4 = 8C 01 +MUS_ENCOUNTER_RICH = 8D 01 +MUS_VERDANTURF = 8E 01 +MUS_RUSTBORO = 8F 01 +MUS_POKE_CENTER = 90 01 +MUS_ROUTE104 = 91 01 +MUS_ROUTE119 = 92 01 MUS_CYCLING = 93 01 -MUS_FRIENDLY = 94 01 -MUS_MISHIRO = 95 01 -MUS_TOZAN = 96 01 -MUS_GIRLEYE = 97 01 -MUS_MINAMO = 98 01 -MUS_ASHROAD = 99 01 -MUS_EVENT0 = 9A 01 -MUS_DEEPDEEP = 9B 01 -MUS_KACHI1 = 9C 01 -MUS_TITLE3 = 9D 01 -MUS_DEMO1 = 9E 01 -MUS_GIRL_SUP = 9F 01 -MUS_HAGESHII = A0 01 -MUS_KAKKOII = A1 01 -MUS_KAZANBAI = A2 01 -MUS_AQA_0 = A3 01 -MUS_TSURETEK = A4 01 -MUS_BOY_SUP = A5 01 -MUS_RAINBOW = A6 01 -MUS_AYASII = A7 01 -MUS_KACHI4 = A8 01 -MUS_ROPEWAY = A9 01 -MUS_CASINO = AA 01 -MUS_HIGHTOWN = AB 01 -MUS_SAFARI = AC 01 -MUS_C_ROAD = AD 01 -MUS_AJITO = AE 01 -MUS_M_BOAT = AF 01 -MUS_M_DUNGON = B0 01 -MUS_FINECITY = B1 01 -MUS_MACHUPI = B2 01 -MUS_P_SCHOOL = B3 01 -MUS_DENDOU = B4 01 -MUS_TONEKUSA = B5 01 -MUS_MABOROSI = B6 01 -MUS_CON_FAN = B7 01 -MUS_CONTEST0 = B8 01 -MUS_MGM0 = B9 01 -MUS_T_BATTLE = BA 01 -MUS_OOAME = BB 01 -MUS_HIDERI = BC 01 -MUS_RUNECITY = BD 01 -MUS_CON_K = BE 01 -MUS_EIKOU_R = BF 01 -MUS_KARAKURI = C0 01 -MUS_HUTAGO = C1 01 -MUS_SITENNOU = C2 01 -MUS_YAMA_EYE = C3 01 -MUS_CONLOBBY = C4 01 -MUS_INTER_V = C5 01 -MUS_DAIGO = C6 01 -MUS_THANKFOR = C7 01 +MUS_POKE_MART = 94 01 +MUS_LITTLEROOT = 95 01 +MUS_MT_CHIMNEY = 96 01 +MUS_ENCOUNTER_FEMALE = 97 01 +MUS_LILYCOVE = 98 01 +MUS_ROUTE111 = 99 01 +MUS_HELP = 9A 01 +MUS_UNDERWATER = 9B 01 +MUS_VICTORY_TRAINER = 9C 01 +MUS_TITLE = 9D 01 +MUS_INTRO = 9E 01 +MUS_ENCOUNTER_MAY = 9F 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 +MUS_ROUTE113 = A2 01 +MUS_ENCOUNTER_AQUA = A3 01 +MUS_FOLLOW_ME = A4 01 +MUS_ENCOUNTER_BRENDAN = A5 01 +MUS_EVER_GRANDE = A6 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 +MUS_VICTORY_AQUA_MAGMA = A8 01 +MUS_CABLE_CAR = A9 01 +MUS_GAME_CORNER = AA 01 +MUS_DEWFORD = AB 01 +MUS_SAFARI_ZONE = AC 01 +MUS_VICTORY_ROAD = AD 01 +MUS_AQUA_MAGMA_HIDEOUT = AE 01 +MUS_SAILING = AF 01 +MUS_MT_PYRE = B0 01 +MUS_SLATEPORT = B1 01 +MUS_MT_PYRE_EXTERIOR = B2 01 +MUS_SCHOOL = B3 01 +MUS_HALL_OF_FAME = B4 01 +MUS_FALLARBOR = B5 01 +MUS_SEALED_CHAMBER = B6 01 +MUS_CONTEST_WINNER = B7 01 +MUS_CONTEST = B8 01 +MUS_ENCOUNTER_MAGMA = B9 01 +MUS_INTRO_BATTLE = BA 01 +MUS_ABNORMAL_WEATHER = BB 01 +MUS_WEATHER_GROUDON = BC 01 +MUS_SOOTOPOLIS = BD 01 +MUS_CONTEST_RESULTS = BE 01 +MUS_HALL_OF_FAME_ROOM = BF 01 +MUS_TRICK_HOUSE = C0 01 +MUS_ENCOUNTER_TWINS = C1 01 +MUS_ENCOUNTER_ELITE_FOUR = C2 01 +MUS_ENCOUNTER_HIKER = C3 01 +MUS_CONTEST_LOBBY = C4 01 +MUS_ENCOUNTER_INTERVIEWER = C5 01 +MUS_ENCOUNTER_CHAMPION = C6 01 +MUS_CREDITS = C7 01 MUS_END = C8 01 MUS_B_FRONTIER = C9 01 MUS_B_ARENA = CA 01 -MUS_ME_POINTGET = CB 01 -MUS_ME_TORE_EYE = CC 01 -MUS_PYRAMID = CD 01 -MUS_PYRAMID_TOP = CE 01 +MUS_OBTAIN_B_POINTS = CB 01 +MUS_REGISTER_MATCH_CALL = CC 01 +MUS_B_PYRAMID = CD 01 +MUS_B_PYRAMID_TOP = CE 01 MUS_B_PALACE = CF 01 -MUS_REKKUU_KOURIN = D0 01 -MUS_SATTOWER = D1 01 -MUS_ME_SYMBOLGET = D2 01 +MUS_RAYQUAZA_APPEARS = D0 01 +MUS_B_TOWER = D1 01 +MUS_OBTAIN_SYMBOL = D2 01 MUS_B_DOME = D3 01 -MUS_B_TUBE = D4 01 +MUS_B_PIKE = D4 01 MUS_B_FACTORY = D5 01 -MUS_VS_REKKU = D6 01 -MUS_VS_FRONT = D7 01 +MUS_VS_RAYQUAZA = D6 01 +MUS_VS_FRONTIER_BRAIN = D7 01 MUS_VS_MEW = D8 01 -MUS_B_DOME1 = D9 01 -MUS_BATTLE27 = DA 01 -MUS_BATTLE31 = DB 01 -MUS_BATTLE20 = DC 01 -MUS_BATTLE32 = DD 01 -MUS_BATTLE33 = DE 01 -MUS_BATTLE36 = DF 01 -MUS_BATTLE34 = E0 01 -MUS_BATTLE35 = E1 01 -MUS_BATTLE38 = E2 01 -MUS_BATTLE30 = E3 01 -MUS_RG_ANNAI = E4 01 -MUS_RG_SLOT = E5 01 -MUS_RG_AJITO = E6 01 +MUS_B_DOME_LOBBY = D9 01 +MUS_VS_WILD = DA 01 +MUS_VS_AQUA_MAGMA = DB 01 +MUS_VS_TRAINER = DC 01 +MUS_VS_GYM_LEADER = DD 01 +MUS_VS_CHAMPION = DE 01 +MUS_VS_REGI = DF 01 +MUS_VS_KYOGRE_GROUDON = E0 01 +MUS_VS_RIVAL = E1 01 +MUS_VS_ELITE_FOUR = E2 01 +MUS_VS_AQUA_MAGMA_LEADER = E3 01 +MUS_RG_FOLLOW_ME = E4 01 +MUS_RG_GAME_CORNER = E5 01 +MUS_RG_ROCKET_HIDEOUT = E6 01 MUS_RG_GYM = E7 01 -MUS_RG_PURIN = E8 01 -MUS_RG_DEMO = E9 01 +MUS_RG_JIGGLYPUFF = E8 01 +MUS_RG_INTRO_FIGHT = E9 01 MUS_RG_TITLE = EA 01 -MUS_RG_GUREN = EB 01 -MUS_RG_SHION = EC 01 -MUS_RG_KAIHUKU = ED 01 +MUS_RG_CINNABAR = EB 01 +MUS_RG_LAVENDER = EC 01 +MUS_RG_HEAL = ED 01 MUS_RG_CYCLING = EE 01 -MUS_RG_ROCKET = EF 01 -MUS_RG_SHOUJO = F0 01 -MUS_RG_SHOUNEN = F1 01 -MUS_RG_DENDOU = F2 01 -MUS_RG_T_MORI = F3 01 -MUS_RG_OTSUKIMI = F4 01 -MUS_RG_POKEYASHI = F5 01 -MUS_RG_ENDING = F6 01 -MUS_RG_LOAD01 = F7 01 -MUS_RG_OPENING = F8 01 -MUS_RG_LOAD02 = F9 01 -MUS_RG_LOAD03 = FA 01 -MUS_RG_CHAMP_R = FB 01 -MUS_RG_VS_GYM = FC 01 -MUS_RG_VS_TORE = FD 01 -MUS_RG_VS_YASEI = FE 01 -MUS_RG_VS_LAST = FF 01 -MUS_RG_MASARA = 00 02 -MUS_RG_KENKYU = 01 02 -MUS_RG_OHKIDO = 02 02 -MUS_RG_POKECEN = 03 02 -MUS_RG_SANTOAN = 04 02 -MUS_RG_NAMINORI = 05 02 -MUS_RG_P_TOWER = 06 02 -MUS_RG_SHIRUHU = 07 02 -MUS_RG_HANADA = 08 02 -MUS_RG_TAMAMUSI = 09 02 -MUS_RG_WIN_TRE = 0A 02 -MUS_RG_WIN_YASEI = 0B 02 -MUS_RG_WIN_GYM = 0C 02 -MUS_RG_KUCHIBA = 0D 02 -MUS_RG_NIBI = 0E 02 -MUS_RG_RIVAL1 = 0F 02 -MUS_RG_RIVAL2 = 10 02 -MUS_RG_FAN2 = 11 02 -MUS_RG_FAN5 = 12 02 -MUS_RG_FAN6 = 13 02 -MUS_ME_RG_PHOTO = 14 02 -MUS_RG_TITLEROG = 15 02 -MUS_RG_GET_YASEI = 16 02 -MUS_RG_SOUSA = 17 02 -MUS_RG_SEKAIKAN = 18 02 -MUS_RG_SEIBETU = 19 02 -MUS_RG_JUMP = 1A 02 -MUS_RG_UNION = 1B 02 -MUS_RG_NETWORK = 1C 02 -MUS_RG_OKURIMONO = 1D 02 -MUS_RG_KINOMIKUI = 1E 02 -MUS_RG_NANADUNGEON = 1F 02 -MUS_RG_OSHIE_TV = 20 02 -MUS_RG_NANASHIMA = 21 02 -MUS_RG_NANAISEKI = 22 02 -MUS_RG_NANA123 = 23 02 -MUS_RG_NANA45 = 24 02 -MUS_RG_NANA67 = 25 02 -MUS_RG_POKEFUE = 26 02 -MUS_RG_VS_DEO = 27 02 -MUS_RG_VS_MYU2 = 28 02 -MUS_RG_VS_DEN = 29 02 -MUS_RG_EXEYE = 2A 02 -MUS_RG_DEOEYE = 2B 02 -MUS_RG_T_TOWER = 2C 02 -MUS_RG_SLOWMASARA = 2D 02 -MUS_RG_TVNOIZE = 2E 02 +MUS_RG_ENCOUNTER_ROCKET = EF 01 +MUS_RG_ENCOUNTER_GIRL = F0 01 +MUS_RG_ENCOUNTER_BOY = F1 01 +MUS_RG_HALL_OF_FAME = F2 01 +MUS_RG_VIRIDIAN_FOREST = F3 01 +MUS_RG_MT_MOON = F4 01 +MUS_RG_POKE_MANSION = F5 01 +MUS_RG_CREDITS = F6 01 +MUS_RG_ROUTE1 = F7 01 +MUS_RG_ROUTE24 = F8 01 +MUS_RG_ROUTE3 = F9 01 +MUS_RG_ROUTE11 = FA 01 +MUS_RG_VICTORY_ROAD = FB 01 +MUS_RG_VS_GYM_LEADER = FC 01 +MUS_RG_VS_TRAINER = FD 01 +MUS_RG_VS_WILD = FE 01 +MUS_RG_VS_CHAMPION = FF 01 +MUS_RG_PALLET = 00 02 +MUS_RG_OAK_LAB = 01 02 +MUS_RG_OAK = 02 02 +MUS_RG_POKE_CENTER = 03 02 +MUS_RG_SS_ANNE = 04 02 +MUS_RG_SURF = 05 02 +MUS_RG_POKE_TOWER = 06 02 +MUS_RG_SILPH = 07 02 +MUS_RG_FUCHSIA = 08 02 +MUS_RG_CELADON = 09 02 +MUS_RG_VICTORY_TRAINER = 0A 02 +MUS_RG_VICTORY_WILD = 0B 02 +MUS_RG_VICTORY_GYM_LEADER = 0C 02 +MUS_RG_VERMILLION = 0D 02 +MUS_RG_PEWTER = 0E 02 +MUS_RG_ENCOUNTER_RIVAL = 0F 02 +MUS_RG_RIVAL_EXIT = 10 02 +MUS_RG_DEX_RATING = 11 02 +MUS_RG_OBTAIN_KEY_ITEM = 12 02 +MUS_RG_CAUGHT_INTRO = 13 02 +MUS_RG_PHOTO = 14 02 +MUS_RG_GAME_FREAK = 15 02 +MUS_RG_CAUGHT = 16 02 +MUS_RG_NEW_GAME_INSTRUCT = 17 02 +MUS_RG_NEW_GAME_INTRO = 18 02 +MUS_RG_NEW_GAME_EXIT = 19 02 +MUS_RG_POKE_JUMP = 1A 02 +MUS_RG_UNION_ROOM = 1B 02 +MUS_RG_NET_CENTER = 1C 02 +MUS_RG_MYSTERY_GIFT = 1D 02 +MUS_RG_BERRY_PICK = 1E 02 +MUS_RG_SEVII_CAVE = 1F 02 +MUS_RG_TEACHY_TV_SHOW = 20 02 +MUS_RG_SEVII_ROUTE = 21 02 +MUS_RG_SEVII_DUNGEON = 22 02 +MUS_RG_SEVII_123 = 23 02 +MUS_RG_SEVII_45 = 24 02 +MUS_RG_SEVII_67 = 25 02 +MUS_RG_POKE_FLUTE = 26 02 +MUS_RG_VS_DEOXYS = 27 02 +MUS_RG_VS_MEWTWO = 28 02 +MUS_RG_VS_LEGEND = 29 02 +MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02 +MUS_RG_ENCOUNTER_DEOXYS = 2B 02 +MUS_RG_TRAINER_TOWER = 2C 02 +MUS_RG_SLOW_PALLET = 2D 02 +MUS_RG_TEACHY_TV_MENU = 2E 02 PH_TRAP_BLEND = 2F 02 PH_TRAP_HELD = 30 02 PH_TRAP_SOLO = 31 02 diff --git a/berry_fix/payload/include/gba/m4a_internal.h b/berry_fix/payload/include/gba/m4a_internal.h index 339a0774ed..494d31f935 100644 --- a/berry_fix/payload/include/gba/m4a_internal.h +++ b/berry_fix/payload/include/gba/m4a_internal.h @@ -100,12 +100,12 @@ struct CgbChannel u8 le; u8 sw; u32 fr; - u32 wp; - u32 cp; - u32 tp; - u32 pp; - u32 np; - u8 d4[8]; + u32 *wp; + u32 *cp; + void *tp; + void *pp; + void *np; + u32 d4[2]; }; struct MusicPlayerTrack; @@ -138,10 +138,10 @@ struct SoundChannel u32 fw; u32 freq; struct WaveData *wav; - u32 cp; + s8 *cp; struct MusicPlayerTrack *track; - u32 pp; - u32 np; + void *pp; + void *np; u32 d4; u16 xpi; u16 xpc; @@ -172,11 +172,11 @@ struct SoundInfo u8 pcmDmaPeriod; // number of V-blanks per PCM DMA u8 maxLines; u8 gap[3]; - s32 pcmSamplesPerVBlank; - s32 pcmFreq; - s32 divFreq; + u32 pcmSamplesPerVBlank; + u32 pcmFreq; + u32 divFreq; struct CgbChannel *cgbChans; - u32 func; + void (*func)(); u32 intp; void (*CgbSound)(void); void (*CgbOscOff)(u8); @@ -184,7 +184,7 @@ struct SoundInfo u32 MPlayJumpTable; u32 plynote; u32 ExtVolPit; - u8 gap2[16]; + u32 gap2[4]; struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS]; s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2]; }; @@ -248,7 +248,7 @@ struct MusicPlayerTrack u8 key; u8 velocity; u8 runningStatus; - u8 keyM; + s8 keyM; u8 pitM; s8 keyShift; s8 keyShiftX; @@ -312,7 +312,7 @@ struct MusicPlayerInfo struct MusicPlayerTrack *tracks; struct ToneData *tone; u32 ident; - u32 func; + void (*func)(); u32 intp; }; @@ -447,7 +447,7 @@ void ply_tune(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_port(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_xcmd(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_endtie(struct MusicPlayerInfo *, struct MusicPlayerTrack *); -void ply_note(struct MusicPlayerInfo *, struct MusicPlayerTrack *); +void ply_note(u8, struct MusicPlayerInfo *, struct MusicPlayerTrack *); // extended sound command handler functions void ply_xxx(struct MusicPlayerInfo *, struct MusicPlayerTrack *); diff --git a/charmap.txt b/charmap.txt index c96202a096..ca4db0fc73 100644 --- a/charmap.txt +++ b/charmap.txt @@ -458,7 +458,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean @ sound and music MUS_DUMMY = 00 00 -SE_KAIFUKU = 01 00 +SE_USE_ITEM = 01 00 SE_PC_LOGIN = 02 00 SE_PC_OFF = 03 00 SE_PC_ON = 04 00 @@ -466,476 +466,476 @@ SE_SELECT = 05 00 SE_WIN_OPEN = 06 00 SE_WALL_HIT = 07 00 SE_DOOR = 08 00 -SE_KAIDAN = 09 00 -SE_DANSA = 0A 00 -SE_JITENSYA = 0B 00 -SE_KOUKA_L = 0C 00 -SE_KOUKA_M = 0D 00 -SE_KOUKA_H = 0E 00 -SE_BOWA2 = 0F 00 -SE_POKE_DEAD = 10 00 -SE_NIGERU = 11 00 -SE_JIDO_DOA = 12 00 -SE_NAMINORI = 13 00 -SE_BAN = 14 00 +SE_EXIT = 09 00 +SE_LEDGE = 0A 00 +SE_BIKE_BELL = 0B 00 +SE_NOT_EFFECTIVE = 0C 00 +SE_EFFECTIVE = 0D 00 +SE_SUPER_EFFECTIVE = 0E 00 +SE_BALL_OPEN = 0F 00 +SE_FAINT = 10 00 +SE_FLEE = 11 00 +SE_SLIDING_DOOR = 12 00 +SE_SHIP = 13 00 +SE_BANG = 14 00 SE_PIN = 15 00 SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 +SE_BALL = 17 00 +SE_CONTEST_PLACE = 18 00 SE_A = 19 00 SE_I = 1A 00 SE_U = 1B 00 SE_E = 1C 00 SE_O = 1D 00 SE_N = 1E 00 -SE_SEIKAI = 1F 00 -SE_HAZURE = 20 00 +SE_SUCCESS = 1F 00 +SE_FAILURE = 20 00 SE_EXP = 21 00 -SE_JITE_PYOKO = 22 00 -SE_MU_PACHI = 23 00 -SE_TK_KASYA = 24 00 +SE_BIKE_HOP = 22 00 +SE_SWITCH = 23 00 +SE_CLICK = 24 00 SE_FU_ZAKU = 25 00 -SE_FU_ZAKU2 = 26 00 -SE_FU_ZUZUZU = 27 00 -SE_RU_GASHIN = 28 00 -SE_RU_GASYAN = 29 00 -SE_RU_BARI = 2A 00 -SE_RU_HYUU = 2B 00 -SE_KI_GASYAN = 2C 00 -SE_TK_WARPIN = 2D 00 -SE_TK_WARPOUT = 2E 00 -SE_TU_SAA = 2F 00 -SE_HI_TURUN = 30 00 -SE_TRACK_MOVE = 31 00 -SE_TRACK_STOP = 32 00 -SE_TRACK_HAIKI = 33 00 -SE_TRACK_DOOR = 34 00 -SE_MOTER = 35 00 +SE_CONTEST_CONDITION_LOSE = 26 00 +SE_LAVARIDGE_FALL_WARP = 27 00 +SE_ICE_STAIRS = 28 00 +SE_ICE_BREAK = 29 00 +SE_ICE_CRACK = 2A 00 +SE_FALL = 2B 00 +SE_UNLOCK = 2C 00 +SE_WARP_IN = 2D 00 +SE_WARP_OUT = 2E 00 +SE_REPEL = 2F 00 +SE_ROTATING_GATE = 30 00 +SE_TRUCK_MOVE = 31 00 +SE_TRUCK_STOP = 32 00 +SE_TRUCK_UNLOAD = 33 00 +SE_TRUCK_DOOR = 34 00 +SE_BERRY_BLENDER = 35 00 SE_CARD = 36 00 SE_SAVE = 37 00 -SE_KON = 38 00 -SE_KON2 = 39 00 -SE_KON3 = 3A 00 -SE_KON4 = 3B 00 -SE_SUIKOMU = 3C 00 -SE_NAGERU = 3D 00 -SE_TOY_C = 3E 00 -SE_TOY_D = 3F 00 -SE_TOY_E = 40 00 -SE_TOY_F = 41 00 -SE_TOY_G = 42 00 -SE_TOY_A = 43 00 -SE_TOY_B = 44 00 -SE_TOY_C1 = 45 00 -SE_MIZU = 46 00 -SE_HASHI = 47 00 -SE_DAUGI = 48 00 -SE_PINPON = 49 00 -SE_FUUSEN1 = 4A 00 -SE_FUUSEN2 = 4B 00 -SE_FUUSEN3 = 4C 00 -SE_TOY_KABE = 4D 00 -SE_TOY_DANGO = 4E 00 -SE_DOKU = 4F 00 -SE_ESUKA = 50 00 -SE_T_AME = 51 00 -SE_T_AME_E = 52 00 -SE_T_OOAME = 53 00 -SE_T_OOAME_E = 54 00 -SE_T_KOAME = 55 00 -SE_T_KOAME_E = 56 00 -SE_T_KAMI = 57 00 -SE_T_KAMI2 = 58 00 -SE_ELEBETA = 59 00 -SE_HINSI = 5A 00 -SE_EXPMAX = 5B 00 -SE_TAMAKORO = 5C 00 -SE_TAMAKORO_E = 5D 00 -SE_BASABASA = 5E 00 -SE_REGI = 5F 00 -SE_C_GAJI = 60 00 -SE_C_MAKU_U = 61 00 -SE_C_MAKU_D = 62 00 -SE_C_PASI = 63 00 -SE_C_SYU = 64 00 -SE_C_PIKON = 65 00 -SE_REAPOKE = 66 00 -SE_OP_BASYU = 67 00 -SE_BT_START = 68 00 -SE_DENDOU = 69 00 -SE_JIHANKI = 6A 00 -SE_TAMA = 6B 00 -SE_Z_SCROLL = 6C 00 -SE_Z_PAGE = 6D 00 -SE_PN_ON = 6E 00 -SE_PN_OFF = 6F 00 -SE_Z_SEARCH = 70 00 -SE_TAMAGO = 71 00 -SE_TB_START = 72 00 -SE_TB_KON = 73 00 -SE_TB_KARA = 74 00 -SE_BIDORO = 75 00 -SE_W085 = 76 00 -SE_W085B = 77 00 -SE_W231 = 78 00 -SE_W171 = 79 00 -SE_W233 = 7A 00 -SE_W233B = 7B 00 -SE_W145 = 7C 00 -SE_W145B = 7D 00 -SE_W145C = 7E 00 -SE_W240 = 7F 00 -SE_W015 = 80 00 -SE_W081 = 81 00 -SE_W081B = 82 00 -SE_W088 = 83 00 -SE_W016 = 84 00 -SE_W016B = 85 00 -SE_W003 = 86 00 -SE_W104 = 87 00 -SE_W013 = 88 00 -SE_W196 = 89 00 -SE_W086 = 8A 00 -SE_W004 = 8B 00 -SE_W025 = 8C 00 -SE_W025B = 8D 00 -SE_W152 = 8E 00 -SE_W026 = 8F 00 -SE_W172 = 90 00 -SE_W172B = 91 00 -SE_W053 = 92 00 -SE_W007 = 93 00 -SE_W092 = 94 00 -SE_W221 = 95 00 -SE_W221B = 96 00 -SE_W052 = 97 00 -SE_W036 = 98 00 -SE_W059 = 99 00 -SE_W059B = 9A 00 -SE_W010 = 9B 00 -SE_W011 = 9C 00 -SE_W017 = 9D 00 -SE_W019 = 9E 00 -SE_W028 = 9F 00 -SE_W013B = A0 00 -SE_W044 = A1 00 -SE_W029 = A2 00 -SE_W057 = A3 00 -SE_W056 = A4 00 -SE_W250 = A5 00 -SE_W030 = A6 00 -SE_W039 = A7 00 -SE_W054 = A8 00 -SE_W077 = A9 00 -SE_W020 = AA 00 -SE_W082 = AB 00 -SE_W047 = AC 00 -SE_W195 = AD 00 -SE_W006 = AE 00 -SE_W091 = AF 00 -SE_W146 = B0 00 -SE_W120 = B1 00 -SE_W153 = B2 00 -SE_W071B = B3 00 -SE_W071 = B4 00 -SE_W103 = B5 00 -SE_W062 = B6 00 -SE_W062B = B7 00 -SE_W048 = B8 00 -SE_W187 = B9 00 -SE_W118 = BA 00 -SE_W155 = BB 00 -SE_W122 = BC 00 -SE_W060 = BD 00 -SE_W185 = BE 00 -SE_W014 = BF 00 -SE_W043 = C0 00 -SE_W207 = C1 00 -SE_W207B = C2 00 -SE_W215 = C3 00 -SE_W109 = C4 00 -SE_W173 = C5 00 -SE_W280 = C6 00 -SE_W202 = C7 00 -SE_W060B = C8 00 -SE_W076 = C9 00 -SE_W080 = CA 00 -SE_W100 = CB 00 -SE_W107 = CC 00 -SE_W166 = CD 00 -SE_W129 = CE 00 -SE_W115 = CF 00 -SE_W112 = D0 00 -SE_W197 = D1 00 -SE_W199 = D2 00 -SE_W236 = D3 00 -SE_W204 = D4 00 -SE_W268 = D5 00 -SE_W070 = D6 00 -SE_W063 = D7 00 -SE_W127 = D8 00 -SE_W179 = D9 00 -SE_W151 = DA 00 -SE_W201 = DB 00 -SE_W161 = DC 00 -SE_W161B = DD 00 -SE_W227 = DE 00 -SE_W227B = DF 00 -SE_W226 = E0 00 -SE_W208 = E1 00 -SE_W213 = E2 00 -SE_W213B = E3 00 -SE_W234 = E4 00 -SE_W260 = E5 00 -SE_W328 = E6 00 -SE_W320 = E7 00 -SE_W255 = E8 00 -SE_W291 = E9 00 -SE_W089 = EA 00 -SE_W239 = EB 00 -SE_W230 = EC 00 -SE_W281 = ED 00 -SE_W327 = EE 00 -SE_W287 = EF 00 -SE_W257 = F0 00 -SE_W253 = F1 00 -SE_W258 = F2 00 -SE_W322 = F3 00 -SE_W298 = F4 00 -SE_W287B = F5 00 -SE_W114 = F6 00 -SE_W063B = F7 00 -SE_RG_W_DOOR = F8 00 -SE_RG_CARD1 = F9 00 -SE_RG_CARD2 = FA 00 -SE_RG_CARD3 = FB 00 -SE_RG_BAG1 = FC 00 -SE_RG_BAG2 = FD 00 -SE_RG_GETTING = FE 00 +SE_BALL_BOUNCE_1 = 38 00 +SE_BALL_BOUNCE_2 = 39 00 +SE_BALL_BOUNCE_3 = 3A 00 +SE_BALL_BOUNCE_4 = 3B 00 +SE_BALL_TRADE = 3C 00 +SE_BALL_THROW = 3D 00 +SE_NOTE_C = 3E 00 +SE_NOTE_D = 3F 00 +SE_NOTE_E = 40 00 +SE_NOTE_F = 41 00 +SE_NOTE_G = 42 00 +SE_NOTE_A = 43 00 +SE_NOTE_B = 44 00 +SE_NOTE_C_HIGH = 45 00 +SE_PUDDLE = 46 00 +SE_BRIDGE_WALK = 47 00 +SE_ITEMFINDER = 48 00 +SE_DING_DONG = 49 00 +SE_BALLOON_RED = 4A 00 +SE_BALLOON_BLUE = 4B 00 +SE_BALLOON_YELLOW = 4C 00 +SE_BREAKABLE_DOOR = 4D 00 +SE_MUD_BALL = 4E 00 +SE_FIELD_POISON = 4F 00 +SE_ESCALATOR = 50 00 +SE_THUNDERSTORM = 51 00 +SE_THUNDERSTORM_STOP = 52 00 +SE_DOWNPOUR = 53 00 +SE_DOWNPOUR_STOP = 54 00 +SE_RAIN = 55 00 +SE_RAIN_STOP = 56 00 +SE_THUNDER = 57 00 +SE_THUNDER2 = 58 00 +SE_ELEVATOR = 59 00 +SE_LOW_HEALTH = 5A 00 +SE_EXP_MAX = 5B 00 +SE_ROULETTE_BALL = 5C 00 +SE_ROULETTE_BALL2 = 5D 00 +SE_TAILLOW_WING_FLAP = 5E 00 +SE_SHOP = 5F 00 +SE_CONTEST_HEART = 60 00 +SE_CONTEST_CURTAIN_RISE = 61 00 +SE_CONTEST_CURTAIN_FALL = 62 00 +SE_CONTEST_ICON_CHANGE = 63 00 +SE_CONTEST_ICON_CLEAR = 64 00 +SE_CONTEST_MONS_TURN = 65 00 +SE_SHINY = 66 00 +SE_INTRO_BLAST = 67 00 +SE_MUGSHOT = 68 00 +SE_APPLAUSE = 69 00 +SE_VEND = 6A 00 +SE_ORB = 6B 00 +SE_DEX_SCROLL = 6C 00 +SE_DEX_PAGE = 6D 00 +SE_POKENAV_ON = 6E 00 +SE_POKENAV_OFF = 6F 00 +SE_DEX_SEARCH = 70 00 +SE_EGG_HATCH = 71 00 +SE_BALL_TRAY_ENTER = 72 00 +SE_BALL_TRAY_BALL = 73 00 +SE_BALL_TRAY_EXIT = 74 00 +SE_GLASS_FLUTE = 75 00 +SE_M_THUNDERBOLT = 76 00 +SE_M_THUNDERBOLT2 = 77 00 +SE_M_HARDEN = 78 00 +SE_M_NIGHTMARE = 79 00 +SE_M_VITAL_THROW = 7A 00 +SE_M_VITAL_THROW2 = 7B 00 +SE_M_BUBBLE = 7C 00 +SE_M_BUBBLE2 = 7D 00 +SE_M_BUBBLE3 = 7E 00 +SE_M_RAIN_DANCE = 7F 00 +SE_M_CUT = 80 00 +SE_M_STRING_SHOT = 81 00 +SE_M_STRING_SHOT2 = 82 00 +SE_M_ROCK_THROW = 83 00 +SE_M_GUST = 84 00 +SE_M_GUST2 = 85 00 +SE_M_DOUBLE_SLAP = 86 00 +SE_M_DOUBLE_TEAM = 87 00 +SE_M_RAZOR_WIND = 88 00 +SE_M_ICY_WIND = 89 00 +SE_M_THUNDER_WAVE = 8A 00 +SE_M_COMET_PUNCH = 8B 00 +SE_M_MEGA_KICK = 8C 00 +SE_M_MEGA_KICK2 = 8D 00 +SE_M_CRABHAMMER = 8E 00 +SE_M_JUMP_KICK = 8F 00 +SE_M_FLAME_WHEEL = 90 00 +SE_M_FLAME_WHEEL2 = 91 00 +SE_M_FLAMETHROWER = 92 00 +SE_M_FIRE_PUNCH = 93 00 +SE_M_TOXIC = 94 00 +SE_M_SACRED_FIRE = 95 00 +SE_M_SACRED_FIRE2 = 96 00 +SE_M_EMBER = 97 00 +SE_M_TAKE_DOWN = 98 00 +SE_M_BLIZZARD = 99 00 +SE_M_BLIZZARD2 = 9A 00 +SE_M_SCRATCH = 9B 00 +SE_M_VICEGRIP = 9C 00 +SE_M_WING_ATTACK = 9D 00 +SE_M_FLY = 9E 00 +SE_M_SAND_ATTACK = 9F 00 +SE_M_RAZOR_WIND2 = A0 00 +SE_M_BITE = A1 00 +SE_M_HEADBUTT = A2 00 +SE_M_SURF = A3 00 +SE_M_HYDRO_PUMP = A4 00 +SE_M_WHIRLPOOL = A5 00 +SE_M_HORN_ATTACK = A6 00 +SE_M_TAIL_WHIP = A7 00 +SE_M_MIST = A8 00 +SE_M_POISON_POWDER = A9 00 +SE_M_BIND = AA 00 +SE_M_DRAGON_RAGE = AB 00 +SE_M_SING = AC 00 +SE_M_PERISH_SONG = AD 00 +SE_M_PAY_DAY = AE 00 +SE_M_DIG = AF 00 +SE_M_DIZZY_PUNCH = B0 00 +SE_M_SELF_DESTRUCT = B1 00 +SE_M_EXPLOSION = B2 00 +SE_M_ABSORB_2 = B3 00 +SE_M_ABSORB = B4 00 +SE_M_SCREECH = B5 00 +SE_M_BUBBLE_BEAM = B6 00 +SE_M_BUBBLE_BEAM2 = B7 00 +SE_M_SUPERSONIC = B8 00 +SE_M_BELLY_DRUM = B9 00 +SE_M_METRONOME = BA 00 +SE_M_BONEMERANG = BB 00 +SE_M_LICK = BC 00 +SE_M_PSYBEAM = BD 00 +SE_M_FAINT_ATTACK = BE 00 +SE_M_SWORDS_DANCE = BF 00 +SE_M_LEER = C0 00 +SE_M_SWAGGER = C1 00 +SE_M_SWAGGER2 = C2 00 +SE_M_HEAL_BELL = C3 00 +SE_M_CONFUSE_RAY = C4 00 +SE_M_SNORE = C5 00 +SE_M_BRICK_BREAK = C6 00 +SE_M_GIGA_DRAIN = C7 00 +SE_M_PSYBEAM2 = C8 00 +SE_M_SOLAR_BEAM = C9 00 +SE_M_PETAL_DANCE = CA 00 +SE_M_TELEPORT = CB 00 +SE_M_MINIMIZE = CC 00 +SE_M_SKETCH = CD 00 +SE_M_SWIFT = CE 00 +SE_M_REFLECT = CF 00 +SE_M_BARRIER = D0 00 +SE_M_DETECT = D1 00 +SE_M_LOCK_ON = D2 00 +SE_M_MOONLIGHT = D3 00 +SE_M_CHARM = D4 00 +SE_M_CHARGE = D5 00 +SE_M_STRENGTH = D6 00 +SE_M_HYPER_BEAM = D7 00 +SE_M_WATERFALL = D8 00 +SE_M_REVERSAL = D9 00 +SE_M_ACID_ARMOR = DA 00 +SE_M_SANDSTORM = DB 00 +SE_M_TRI_ATTACK = DC 00 +SE_M_TRI_ATTACK2 = DD 00 +SE_M_ENCORE = DE 00 +SE_M_ENCORE2 = DF 00 +SE_M_BATON_PASS = E0 00 +SE_M_MILK_DRINK = E1 00 +SE_M_ATTRACT = E2 00 +SE_M_ATTRACT2 = E3 00 +SE_M_MORNING_SUN = E4 00 +SE_M_FLATTER = E5 00 +SE_M_SAND_TOMB = E6 00 +SE_M_GRASSWHISTLE = E7 00 +SE_M_SPIT_UP = E8 00 +SE_M_DIVE = E9 00 +SE_M_EARTHQUAKE = EA 00 +SE_M_TWISTER = EB 00 +SE_M_SWEET_SCENT = EC 00 +SE_M_YAWN = ED 00 +SE_M_SKY_UPPERCUT = EE 00 +SE_M_STAT_INCREASE = EF 00 +SE_M_HEAT_WAVE = F0 00 +SE_M_UPROAR = F1 00 +SE_M_HAIL = F2 00 +SE_M_COSMIC_POWER = F3 00 +SE_M_TEETER_DANCE = F4 00 +SE_M_STAT_DECREASE = F5 00 +SE_M_HAZE = F6 00 +SE_M_HYPER_BEAM2 = F7 00 +SE_RG_DOOR = F8 00 +SE_RG_CARD_FLIP = F9 00 +SE_RG_CARD_FLIPPING = FA 00 +SE_RG_CARD_OPEN = FB 00 +SE_RG_BAG_CURSOR = FC 00 +SE_RG_BAG_POCKET = FD 00 +SE_RG_BALL_CLICK = FE 00 SE_RG_SHOP = FF 00 -SE_RG_KITEKI = 00 01 -SE_RG_HELP_OP = 01 01 -SE_RG_HELP_CL = 02 01 -SE_RG_HELP_NG = 03 01 -SE_RG_DEOMOV = 04 01 -SE_RG_EXCELLENT = 05 01 -SE_RG_NAWAMISS = 06 01 -SE_TOREEYE = 07 01 -SE_TOREOFF = 08 01 -SE_HANTEI1 = 09 01 -SE_HANTEI2 = 0A 01 -SE_CURTAIN = 0B 01 -SE_CURTAIN1 = 0C 01 -SE_USSOKI = 0D 01 -MUS_TETSUJI = 5E 01 -MUS_FIELD13 = 5F 01 -MUS_KACHI22 = 60 01 -MUS_KACHI2 = 61 01 -MUS_KACHI3 = 62 01 -MUS_KACHI5 = 63 01 -MUS_PCC = 64 01 -MUS_NIBI = 65 01 -MUS_SUIKUN = 66 01 -MUS_DOORO1 = 67 01 -MUS_DOORO_X1 = 68 01 -MUS_DOORO_X3 = 69 01 -MUS_MACHI_S2 = 6A 01 -MUS_MACHI_S4 = 6B 01 -MUS_GIM = 6C 01 -MUS_NAMINORI = 6D 01 -MUS_DAN01 = 6E 01 -MUS_FANFA1 = 6F 01 -MUS_ME_ASA = 70 01 -MUS_ME_BACHI = 71 01 -MUS_FANFA4 = 72 01 -MUS_FANFA5 = 73 01 -MUS_ME_WAZA = 74 01 -MUS_BIJYUTU = 75 01 -MUS_DOORO_X4 = 76 01 -MUS_FUNE_KAN = 77 01 -MUS_ME_SHINKA = 78 01 -MUS_SHINKA = 79 01 -MUS_ME_WASURE = 7A 01 -MUS_SYOUJOEYE = 7B 01 -MUS_BOYEYE = 7C 01 -MUS_DAN02 = 7D 01 -MUS_MACHI_S3 = 7E 01 -MUS_ODAMAKI = 7F 01 -MUS_B_TOWER = 80 01 -MUS_SWIMEYE = 81 01 -MUS_DAN03 = 82 01 -MUS_ME_KINOMI = 83 01 -MUS_ME_TAMA = 84 01 -MUS_ME_B_BIG = 85 01 -MUS_ME_B_SMALL = 86 01 -MUS_ME_ZANNEN = 87 01 -MUS_BD_TIME = 88 01 -MUS_TEST1 = 89 01 -MUS_TEST2 = 8A 01 -MUS_TEST3 = 8B 01 -MUS_TEST4 = 8C 01 -MUS_TEST = 8D 01 -MUS_GOMACHI0 = 8E 01 -MUS_GOTOWN = 8F 01 -MUS_POKECEN = 90 01 -MUS_NEXTROAD = 91 01 -MUS_GRANROAD = 92 01 +SE_RG_SS_ANNE_HORN = 00 01 +SE_RG_HELP_OPEN = 01 01 +SE_RG_HELP_CLOSE = 02 01 +SE_RG_HELP_ERROR = 03 01 +SE_RG_DEOXYS_MOVE = 04 01 +SE_RG_POKE_JUMP_SUCCESS = 05 01 +SE_RG_POKE_JUMP_FAILURE = 06 01 +SE_POKENAV_CALL = 07 01 +SE_POKENAV_HANG_UP = 08 01 +SE_ARENA_TIMEUP1 = 09 01 +SE_ARENA_TIMEUP2 = 0A 01 +SE_PIKE_CURTAIN_CLOSE = 0B 01 +SE_PIKE_CURTAIN_OPEN = 0C 01 +SE_SUDOWOODO_SHAKE = 0D 01 +MUS_LITTLEROOT_TEST = 5E 01 +MUS_GSC_ROUTE38 = 5F 01 +MUS_CAUGHT = 60 01 +MUS_VICTORY_WILD = 61 01 +MUS_VICTORY_GYM_LEADER = 62 01 +MUS_VICTORY_LEAGUE = 63 01 +MUS_C_COMM_CENTER = 64 01 +MUS_GSC_PEWTER = 65 01 +MUS_C_VS_LEGEND_BEAST = 66 01 +MUS_ROUTE101 = 67 01 +MUS_ROUTE110 = 68 01 +MUS_ROUTE120 = 69 01 +MUS_PETALBURG = 6A 01 +MUS_OLDALE = 6B 01 +MUS_GYM = 6C 01 +MUS_SURF = 6D 01 +MUS_PETALBURG_WOODS = 6E 01 +MUS_LEVEL_UP = 6F 01 +MUS_HEAL = 70 01 +MUS_OBTAIN_BADGE = 71 01 +MUS_OBTAIN_ITEM = 72 01 +MUS_EVOLVED = 73 01 +MUS_OBTAIN_TMHM = 74 01 +MUS_LILYCOVE_MUSEUM = 75 01 +MUS_ROUTE122 = 76 01 +MUS_OCEANIC_MUSEUM = 77 01 +MUS_EVOLUTION_INTRO = 78 01 +MUS_EVOLUTION = 79 01 +MUS_MOVE_DELETED = 7A 01 +MUS_ENCOUNTER_GIRL = 7B 01 +MUS_ENCOUNTER_MALE = 7C 01 +MUS_ABANDONED_SHIP = 7D 01 +MUS_FORTREE = 7E 01 +MUS_BIRCH_LAB = 7F 01 +MUS_B_TOWER_RS = 80 01 +MUS_ENCOUNTER_SWIMMER = 81 01 +MUS_CAVE_OF_ORIGIN = 82 01 +MUS_OBTAIN_BERRY = 83 01 +MUS_AWAKEN_LEGEND = 84 01 +MUS_SLOTS_JACKPOT = 85 01 +MUS_SLOTS_WIN = 86 01 +MUS_TOO_BAD = 87 01 +MUS_ROULETTE = 88 01 +MUS_LINK_CONTEST_P1 = 89 01 +MUS_LINK_CONTEST_P2 = 8A 01 +MUS_LINK_CONTEST_P3 = 8B 01 +MUS_LINK_CONTEST_P4 = 8C 01 +MUS_ENCOUNTER_RICH = 8D 01 +MUS_VERDANTURF = 8E 01 +MUS_RUSTBORO = 8F 01 +MUS_POKE_CENTER = 90 01 +MUS_ROUTE104 = 91 01 +MUS_ROUTE119 = 92 01 MUS_CYCLING = 93 01 -MUS_FRIENDLY = 94 01 -MUS_MISHIRO = 95 01 -MUS_TOZAN = 96 01 -MUS_GIRLEYE = 97 01 -MUS_MINAMO = 98 01 -MUS_ASHROAD = 99 01 -MUS_EVENT0 = 9A 01 -MUS_DEEPDEEP = 9B 01 -MUS_KACHI1 = 9C 01 -MUS_TITLE3 = 9D 01 -MUS_DEMO1 = 9E 01 -MUS_GIRL_SUP = 9F 01 -MUS_HAGESHII = A0 01 -MUS_KAKKOII = A1 01 -MUS_KAZANBAI = A2 01 -MUS_AQA_0 = A3 01 -MUS_TSURETEK = A4 01 -MUS_BOY_SUP = A5 01 -MUS_RAINBOW = A6 01 -MUS_AYASII = A7 01 -MUS_KACHI4 = A8 01 -MUS_ROPEWAY = A9 01 -MUS_CASINO = AA 01 -MUS_HIGHTOWN = AB 01 -MUS_SAFARI = AC 01 -MUS_C_ROAD = AD 01 -MUS_AJITO = AE 01 -MUS_M_BOAT = AF 01 -MUS_M_DUNGON = B0 01 -MUS_FINECITY = B1 01 -MUS_MACHUPI = B2 01 -MUS_P_SCHOOL = B3 01 -MUS_DENDOU = B4 01 -MUS_TONEKUSA = B5 01 -MUS_MABOROSI = B6 01 -MUS_CON_FAN = B7 01 -MUS_CONTEST0 = B8 01 -MUS_MGM0 = B9 01 -MUS_T_BATTLE = BA 01 -MUS_OOAME = BB 01 -MUS_HIDERI = BC 01 -MUS_RUNECITY = BD 01 -MUS_CON_K = BE 01 -MUS_EIKOU_R = BF 01 -MUS_KARAKURI = C0 01 -MUS_HUTAGO = C1 01 -MUS_SITENNOU = C2 01 -MUS_YAMA_EYE = C3 01 -MUS_CONLOBBY = C4 01 -MUS_INTER_V = C5 01 -MUS_DAIGO = C6 01 -MUS_THANKFOR = C7 01 +MUS_POKE_MART = 94 01 +MUS_LITTLEROOT = 95 01 +MUS_MT_CHIMNEY = 96 01 +MUS_ENCOUNTER_FEMALE = 97 01 +MUS_LILYCOVE = 98 01 +MUS_ROUTE111 = 99 01 +MUS_HELP = 9A 01 +MUS_UNDERWATER = 9B 01 +MUS_VICTORY_TRAINER = 9C 01 +MUS_TITLE = 9D 01 +MUS_INTRO = 9E 01 +MUS_ENCOUNTER_MAY = 9F 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 +MUS_ROUTE113 = A2 01 +MUS_ENCOUNTER_AQUA = A3 01 +MUS_FOLLOW_ME = A4 01 +MUS_ENCOUNTER_BRENDAN = A5 01 +MUS_EVER_GRANDE = A6 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 +MUS_VICTORY_AQUA_MAGMA = A8 01 +MUS_CABLE_CAR = A9 01 +MUS_GAME_CORNER = AA 01 +MUS_DEWFORD = AB 01 +MUS_SAFARI_ZONE = AC 01 +MUS_VICTORY_ROAD = AD 01 +MUS_AQUA_MAGMA_HIDEOUT = AE 01 +MUS_SAILING = AF 01 +MUS_MT_PYRE = B0 01 +MUS_SLATEPORT = B1 01 +MUS_MT_PYRE_EXTERIOR = B2 01 +MUS_SCHOOL = B3 01 +MUS_HALL_OF_FAME = B4 01 +MUS_FALLARBOR = B5 01 +MUS_SEALED_CHAMBER = B6 01 +MUS_CONTEST_WINNER = B7 01 +MUS_CONTEST = B8 01 +MUS_ENCOUNTER_MAGMA = B9 01 +MUS_INTRO_BATTLE = BA 01 +MUS_ABNORMAL_WEATHER = BB 01 +MUS_WEATHER_GROUDON = BC 01 +MUS_SOOTOPOLIS = BD 01 +MUS_CONTEST_RESULTS = BE 01 +MUS_HALL_OF_FAME_ROOM = BF 01 +MUS_TRICK_HOUSE = C0 01 +MUS_ENCOUNTER_TWINS = C1 01 +MUS_ENCOUNTER_ELITE_FOUR = C2 01 +MUS_ENCOUNTER_HIKER = C3 01 +MUS_CONTEST_LOBBY = C4 01 +MUS_ENCOUNTER_INTERVIEWER = C5 01 +MUS_ENCOUNTER_CHAMPION = C6 01 +MUS_CREDITS = C7 01 MUS_END = C8 01 MUS_B_FRONTIER = C9 01 MUS_B_ARENA = CA 01 -MUS_ME_POINTGET = CB 01 -MUS_ME_TORE_EYE = CC 01 -MUS_PYRAMID = CD 01 -MUS_PYRAMID_TOP = CE 01 +MUS_OBTAIN_B_POINTS = CB 01 +MUS_REGISTER_MATCH_CALL = CC 01 +MUS_B_PYRAMID = CD 01 +MUS_B_PYRAMID_TOP = CE 01 MUS_B_PALACE = CF 01 -MUS_REKKUU_KOURIN = D0 01 -MUS_SATTOWER = D1 01 -MUS_ME_SYMBOLGET = D2 01 +MUS_RAYQUAZA_APPEARS = D0 01 +MUS_B_TOWER = D1 01 +MUS_OBTAIN_SYMBOL = D2 01 MUS_B_DOME = D3 01 -MUS_B_TUBE = D4 01 +MUS_B_PIKE = D4 01 MUS_B_FACTORY = D5 01 -MUS_VS_REKKU = D6 01 -MUS_VS_FRONT = D7 01 +MUS_VS_RAYQUAZA = D6 01 +MUS_VS_FRONTIER_BRAIN = D7 01 MUS_VS_MEW = D8 01 -MUS_B_DOME1 = D9 01 -MUS_BATTLE27 = DA 01 -MUS_BATTLE31 = DB 01 -MUS_BATTLE20 = DC 01 -MUS_BATTLE32 = DD 01 -MUS_BATTLE33 = DE 01 -MUS_BATTLE36 = DF 01 -MUS_BATTLE34 = E0 01 -MUS_BATTLE35 = E1 01 -MUS_BATTLE38 = E2 01 -MUS_BATTLE30 = E3 01 -MUS_RG_ANNAI = E4 01 -MUS_RG_SLOT = E5 01 -MUS_RG_AJITO = E6 01 +MUS_B_DOME_LOBBY = D9 01 +MUS_VS_WILD = DA 01 +MUS_VS_AQUA_MAGMA = DB 01 +MUS_VS_TRAINER = DC 01 +MUS_VS_GYM_LEADER = DD 01 +MUS_VS_CHAMPION = DE 01 +MUS_VS_REGI = DF 01 +MUS_VS_KYOGRE_GROUDON = E0 01 +MUS_VS_RIVAL = E1 01 +MUS_VS_ELITE_FOUR = E2 01 +MUS_VS_AQUA_MAGMA_LEADER = E3 01 +MUS_RG_FOLLOW_ME = E4 01 +MUS_RG_GAME_CORNER = E5 01 +MUS_RG_ROCKET_HIDEOUT = E6 01 MUS_RG_GYM = E7 01 -MUS_RG_PURIN = E8 01 -MUS_RG_DEMO = E9 01 +MUS_RG_JIGGLYPUFF = E8 01 +MUS_RG_INTRO_FIGHT = E9 01 MUS_RG_TITLE = EA 01 -MUS_RG_GUREN = EB 01 -MUS_RG_SHION = EC 01 -MUS_RG_KAIHUKU = ED 01 +MUS_RG_CINNABAR = EB 01 +MUS_RG_LAVENDER = EC 01 +MUS_RG_HEAL = ED 01 MUS_RG_CYCLING = EE 01 -MUS_RG_ROCKET = EF 01 -MUS_RG_SHOUJO = F0 01 -MUS_RG_SHOUNEN = F1 01 -MUS_RG_DENDOU = F2 01 -MUS_RG_T_MORI = F3 01 -MUS_RG_OTSUKIMI = F4 01 -MUS_RG_POKEYASHI = F5 01 -MUS_RG_ENDING = F6 01 -MUS_RG_LOAD01 = F7 01 -MUS_RG_OPENING = F8 01 -MUS_RG_LOAD02 = F9 01 -MUS_RG_LOAD03 = FA 01 -MUS_RG_CHAMP_R = FB 01 -MUS_RG_VS_GYM = FC 01 -MUS_RG_VS_TORE = FD 01 -MUS_RG_VS_YASEI = FE 01 -MUS_RG_VS_LAST = FF 01 -MUS_RG_MASARA = 00 02 -MUS_RG_KENKYU = 01 02 -MUS_RG_OHKIDO = 02 02 -MUS_RG_POKECEN = 03 02 -MUS_RG_SANTOAN = 04 02 -MUS_RG_NAMINORI = 05 02 -MUS_RG_P_TOWER = 06 02 -MUS_RG_SHIRUHU = 07 02 -MUS_RG_HANADA = 08 02 -MUS_RG_TAMAMUSI = 09 02 -MUS_RG_WIN_TRE = 0A 02 -MUS_RG_WIN_YASEI = 0B 02 -MUS_RG_WIN_GYM = 0C 02 -MUS_RG_KUCHIBA = 0D 02 -MUS_RG_NIBI = 0E 02 -MUS_RG_RIVAL1 = 0F 02 -MUS_RG_RIVAL2 = 10 02 -MUS_RG_FAN2 = 11 02 -MUS_RG_FAN5 = 12 02 -MUS_RG_FAN6 = 13 02 -MUS_ME_RG_PHOTO = 14 02 -MUS_RG_TITLEROG = 15 02 -MUS_RG_GET_YASEI = 16 02 -MUS_RG_SOUSA = 17 02 -MUS_RG_SEKAIKAN = 18 02 -MUS_RG_SEIBETU = 19 02 -MUS_RG_JUMP = 1A 02 -MUS_RG_UNION = 1B 02 -MUS_RG_NETWORK = 1C 02 -MUS_RG_OKURIMONO = 1D 02 -MUS_RG_KINOMIKUI = 1E 02 -MUS_RG_NANADUNGEON = 1F 02 -MUS_RG_OSHIE_TV = 20 02 -MUS_RG_NANASHIMA = 21 02 -MUS_RG_NANAISEKI = 22 02 -MUS_RG_NANA123 = 23 02 -MUS_RG_NANA45 = 24 02 -MUS_RG_NANA67 = 25 02 -MUS_RG_POKEFUE = 26 02 -MUS_RG_VS_DEO = 27 02 -MUS_RG_VS_MYU2 = 28 02 -MUS_RG_VS_DEN = 29 02 -MUS_RG_EXEYE = 2A 02 -MUS_RG_DEOEYE = 2B 02 -MUS_RG_T_TOWER = 2C 02 -MUS_RG_SLOWMASARA = 2D 02 -MUS_RG_TVNOIZE = 2E 02 +MUS_RG_ENCOUNTER_ROCKET = EF 01 +MUS_RG_ENCOUNTER_GIRL = F0 01 +MUS_RG_ENCOUNTER_BOY = F1 01 +MUS_RG_HALL_OF_FAME = F2 01 +MUS_RG_VIRIDIAN_FOREST = F3 01 +MUS_RG_MT_MOON = F4 01 +MUS_RG_POKE_MANSION = F5 01 +MUS_RG_CREDITS = F6 01 +MUS_RG_ROUTE1 = F7 01 +MUS_RG_ROUTE24 = F8 01 +MUS_RG_ROUTE3 = F9 01 +MUS_RG_ROUTE11 = FA 01 +MUS_RG_VICTORY_ROAD = FB 01 +MUS_RG_VS_GYM_LEADER = FC 01 +MUS_RG_VS_TRAINER = FD 01 +MUS_RG_VS_WILD = FE 01 +MUS_RG_VS_CHAMPION = FF 01 +MUS_RG_PALLET = 00 02 +MUS_RG_OAK_LAB = 01 02 +MUS_RG_OAK = 02 02 +MUS_RG_POKE_CENTER = 03 02 +MUS_RG_SS_ANNE = 04 02 +MUS_RG_SURF = 05 02 +MUS_RG_POKE_TOWER = 06 02 +MUS_RG_SILPH = 07 02 +MUS_RG_FUCHSIA = 08 02 +MUS_RG_CELADON = 09 02 +MUS_RG_VICTORY_TRAINER = 0A 02 +MUS_RG_VICTORY_WILD = 0B 02 +MUS_RG_VICTORY_GYM_LEADER = 0C 02 +MUS_RG_VERMILLION = 0D 02 +MUS_RG_PEWTER = 0E 02 +MUS_RG_ENCOUNTER_RIVAL = 0F 02 +MUS_RG_RIVAL_EXIT = 10 02 +MUS_RG_DEX_RATING = 11 02 +MUS_RG_OBTAIN_KEY_ITEM = 12 02 +MUS_RG_CAUGHT_INTRO = 13 02 +MUS_RG_PHOTO = 14 02 +MUS_RG_GAME_FREAK = 15 02 +MUS_RG_CAUGHT = 16 02 +MUS_RG_NEW_GAME_INSTRUCT = 17 02 +MUS_RG_NEW_GAME_INTRO = 18 02 +MUS_RG_NEW_GAME_EXIT = 19 02 +MUS_RG_POKE_JUMP = 1A 02 +MUS_RG_UNION_ROOM = 1B 02 +MUS_RG_NET_CENTER = 1C 02 +MUS_RG_MYSTERY_GIFT = 1D 02 +MUS_RG_BERRY_PICK = 1E 02 +MUS_RG_SEVII_CAVE = 1F 02 +MUS_RG_TEACHY_TV_SHOW = 20 02 +MUS_RG_SEVII_ROUTE = 21 02 +MUS_RG_SEVII_DUNGEON = 22 02 +MUS_RG_SEVII_123 = 23 02 +MUS_RG_SEVII_45 = 24 02 +MUS_RG_SEVII_67 = 25 02 +MUS_RG_POKE_FLUTE = 26 02 +MUS_RG_VS_DEOXYS = 27 02 +MUS_RG_VS_MEWTWO = 28 02 +MUS_RG_VS_LEGEND = 29 02 +MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02 +MUS_RG_ENCOUNTER_DEOXYS = 2B 02 +MUS_RG_TRAINER_TOWER = 2C 02 +MUS_RG_SLOW_PALLET = 2D 02 +MUS_RG_TEACHY_TV_MENU = 2E 02 PH_TRAP_BLEND = 2F 02 PH_TRAP_HELD = 30 02 PH_TRAP_SOLO = 31 02 diff --git a/common_syms/battle_anim_special.txt b/common_syms/battle_anim_special.txt deleted file mode 100755 index 2fc194df71..0000000000 --- a/common_syms/battle_anim_special.txt +++ /dev/null @@ -1,3 +0,0 @@ -gUnknown_030062DC -gUnknown_030062E0 -gUnknown_030062E4 diff --git a/common_syms/battle_anim_throw.txt b/common_syms/battle_anim_throw.txt new file mode 100755 index 0000000000..5e2e8b3ff3 --- /dev/null +++ b/common_syms/battle_anim_throw.txt @@ -0,0 +1,3 @@ +gMonShrinkDuration +gMonShrinkDelta +gMonShrinkDistance diff --git a/constants/gba_constants.inc b/constants/gba_constants.inc index 3ff857ee8d..13cbadf802 100644 --- a/constants/gba_constants.inc +++ b/constants/gba_constants.inc @@ -26,9 +26,9 @@ .set OAM, 0x7000000 - .set SOUND_INFO_PTR, 0x3007FF0 - .set INTR_CHECK, 0x3007FF8 - .set INTR_VECTOR, 0x3007FFC + .set SOUND_INFO_PTR, IWRAM_END - 0x10 + .set INTR_CHECK, IWRAM_END - 0x8 + .set INTR_VECTOR, IWRAM_END - 0x4 .set INTR_FLAG_VBLANK, 1 << 0 .set INTR_FLAG_HBLANK, 1 << 1 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index cacb1c4438..b4bb339931 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -416,7 +416,7 @@ gBattleAnims_Special:: .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON .4byte Special_BallThrow @ B_ANIM_BALL_THROW - .4byte Special_SafariBallThrow @ B_ANIM_SAFARI_BALL_THROW + .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE @@ -426,7 +426,7 @@ Move_POUND: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -441,7 +441,7 @@ Move_DOUBLE_SLAP: choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -456,7 +456,7 @@ DoubleSlapRight: Move_POISON_POWDER: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -480,7 +480,7 @@ Move_POISON_POWDER: Move_STUN_SPORE: loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -504,7 +504,7 @@ Move_STUN_SPORE: Move_SLEEP_POWDER: loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -531,21 +531,21 @@ Move_SWIFT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -557,20 +557,20 @@ Move_STRENGTH: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, ANIM_TARGET, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, ANIM_TARGET, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, ANIM_TARGET, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -587,7 +587,7 @@ Move_TACKLE: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -597,14 +597,14 @@ Move_BODY_SLAM: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -636,7 +636,7 @@ Move_SUPERSONIC: blendoff end SupersonicRing: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gSupersonicRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -651,7 +651,7 @@ Move_SCREECH: waitforvisualfinish end ScreechRing: - playsewithpan SE_W103, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCREECH, SOUND_PAN_ATTACKER createsprite gScreechRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -661,31 +661,31 @@ Move_FLAME_WHEEL: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call FireSpreadEffect delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 @@ -704,22 +704,22 @@ Move_PIN_MISSILE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -733,22 +733,22 @@ Move_ICICLE_SPEAR: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -764,7 +764,7 @@ Move_TAKE_DOWN: delay 35 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -781,19 +781,19 @@ Move_TAKE_DOWN: Move_DOUBLE_EDGE: loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -819,12 +819,12 @@ Move_POISON_STING: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish @@ -838,13 +838,13 @@ Move_TWINEEDLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 6, 2 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2 delay 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -854,7 +854,7 @@ Move_TWINEEDLE: Move_FIRE_BLAST: loadspritegfx ANIM_TAG_SMALL_EMBER - createsoundtask sub_8158B30, SE_W172, SE_W172B + createsoundtask sub_8158B30, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2 call FireBlastRing call FireBlastRing call FireBlastRing @@ -902,29 +902,29 @@ FireBlastCross: Move_LEECH_SEED: loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call EmberFireHit call EmberFireHit call EmberFireHit @@ -942,7 +942,7 @@ Move_MEGA_PUNCH: delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 50 @@ -951,7 +951,7 @@ Move_MEGA_PUNCH: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -985,11 +985,11 @@ Move_MEGA_KICK: delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 50 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET call SetImpactBackground createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 @@ -1011,7 +1011,7 @@ Move_COMET_PUNCH: choosetwoturnanim CometPunchLeft, CometPunchRight CometPunchContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1041,7 +1041,7 @@ Move_SONIC_BOOM: blendoff end SonicBoomProjectile: - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1057,7 +1057,7 @@ Move_THUNDER_SHOCK: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1079,13 +1079,13 @@ Move_THUNDERBOLT: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1101,7 +1101,7 @@ Move_THUNDERBOLT: createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 0 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 2, 2, RGB_BLACK delay 6 @@ -1112,7 +1112,7 @@ Move_THUNDERBOLT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1128,9 +1128,9 @@ Move_THUNDER_WAVE: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0 @@ -1156,23 +1156,23 @@ BeatUpLeft: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue Move_STOMP: @@ -1180,19 +1180,19 @@ Move_STOMP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAIL_WHIP: - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end @@ -1201,7 +1201,7 @@ Move_CUT: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 @@ -1213,14 +1213,14 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1229,7 +1229,7 @@ Move_HIDDEN_POWER: createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, 0xFFFF - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 @@ -1245,13 +1245,13 @@ Move_REVERSAL: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendColorCycle, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1262,7 +1262,7 @@ Move_REVERSAL: delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 @@ -1286,12 +1286,12 @@ PursuitContinue: waitbgfadein end PursuitNormal: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0 goto PursuitContinue @@ -1304,7 +1304,7 @@ Move_SPIKE_CANNON: setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 @@ -1314,7 +1314,7 @@ Move_SPIKE_CANNON: createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1324,7 +1324,7 @@ Move_SWORDS_DANCE: loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 @@ -1340,12 +1340,12 @@ Move_PSYCH_UP: monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, RGB_BLACK setalpha 12, 8 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 5, 10 createsprite gPsychUpSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER delay 127 delay 4 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask AnimTask_BlendBattleAnimPal, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 @@ -1363,7 +1363,7 @@ Move_DIZZY_PUNCH: call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, ANIM_TARGET, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 128, -16 @@ -1374,7 +1374,7 @@ Move_DIZZY_PUNCH: call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 128, -16 @@ -1393,7 +1393,7 @@ DizzyPunchLunge: Move_FIRE_SPIN: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect @@ -1420,7 +1420,7 @@ Move_FURY_CUTTER: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_IsFuryCutterHitRight, 2 jumpretfalse FuryCutterLeft goto FuryCutterRight @@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 9, 0, RGB_RED end SelfDestructExplode: - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1490,12 +1490,12 @@ Move_SLAM: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W004, SOUND_PAN_ATTACKER + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 @@ -1511,10 +1511,10 @@ Move_SLAM: Move_VINE_WHIP: loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 @@ -1524,12 +1524,12 @@ Move_DRILL_PECK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8 createvisualtask AnimTask_DrillPeckHitSplats, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -1547,28 +1547,28 @@ Move_WATERFALL: setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, 15, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 25, 20, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -20, 20, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, ANIM_ATTACKER waitforvisualfinish delay 10 @@ -1581,7 +1581,7 @@ Move_WATERFALL: end RisingWaterHitEffect: - playsewithpan SE_W127, SOUND_PAN_TARGET + playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 20 @@ -1636,26 +1636,26 @@ Move_EXPLOSION: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 16, 0, RGB_WHITE end Explosion1: - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5 waitforvisualfinish @@ -1669,7 +1669,7 @@ Move_PROTECT: loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1681,7 +1681,7 @@ Move_DETECT: waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_WHITE delay 18 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1706,15 +1706,15 @@ Frustration_Continue: blendoff end Frustration_Strongest: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1722,65 +1722,65 @@ Frustration_Strongest: delay 5 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Strong: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5 delay 7 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Medium: - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 goto Frustration_Continue @@ -1790,7 +1790,7 @@ Frustration_Weak: delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 goto Frustration_Continue @@ -1799,14 +1799,14 @@ Move_SAFEGUARD: loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1818,21 +1818,21 @@ Move_PAIN_SPLIT: createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2 end @@ -1842,7 +1842,7 @@ Move_VICE_GRIP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 @@ -1860,7 +1860,7 @@ Move_GUILLOTINE: setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_BLACK @@ -1870,7 +1870,7 @@ Move_GUILLOTINE: createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1884,10 +1884,10 @@ Move_PAY_DAY: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, SOUND_PAN_TARGET + playsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 2 createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 @@ -1898,7 +1898,7 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3 createvisualtask AnimTask_BlendColorCycle, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 delay 0 @@ -1946,7 +1946,7 @@ Move_SPARK: loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0 delay 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0 @@ -1955,7 +1955,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1 delay 0 @@ -1964,7 +1964,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -1978,7 +1978,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -1989,12 +1989,12 @@ Move_SPARK: Move_ATTRACT: loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 + loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 @@ -2002,7 +2002,7 @@ Move_ATTRACT: createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 15 + waitplaysewithpan SE_M_ATTRACT2, 0, 15 createvisualtask AnimTask_HeartsBackground, 5 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 @@ -2024,7 +2024,7 @@ Move_GROWTH: end GrowthEffect: createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return @@ -2037,12 +2037,12 @@ Move_WHIRLWIND: createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, ANIM_TARGET, 60, 4 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, ANIM_TARGET, 60, 0 delay 5 - loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createvisualtask AnimTask_SlideOffScreen, 5, ANIM_TARGET, 8 waitforvisualfinish end @@ -2057,7 +2057,7 @@ Move_CONFUSE_RAY: createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gConfuseRayBallSpiralSpriteTemplate, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2082,10 +2082,10 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 - waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_M_LEER, SOUND_PAN_TARGET, 85 createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2 delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK @@ -2098,20 +2098,20 @@ Move_ROCK_THROW: loadspritegfx ANIM_TAG_ROCKS createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish end @@ -2120,16 +2120,16 @@ Move_ROCK_SLIDE: monbg ANIM_DEF_PARTNER createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2141,28 +2141,28 @@ Move_ROCK_SLIDE: RockSlideRocks: createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 return @@ -2175,7 +2175,7 @@ Move_THIEF: setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish @@ -2205,22 +2205,22 @@ Move_BUBBLE_BEAM: end BulbblebeamCreateBubbles: createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 return @@ -2231,14 +2231,14 @@ Move_ICY_WIND: createvisualtask AnimTask_BlendBattleAnimPal, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call IcyWindSwirlingSnowballs delay 5 call IcyWindSwirlingSnowballs - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET delay 55 call IceSpikesEffectLong waitforvisualfinish @@ -2263,12 +2263,12 @@ IcyWindSwirlingSnowballs: Move_SMOKESCREEN: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask AnimTask_SmokescreenImpact, 2 delay 2 - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75 @@ -2290,7 +2290,7 @@ Move_CONVERSION: monbgprio_28 ANIM_ATTACKER setalpha 16, 0 delay 0 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 @@ -2299,7 +2299,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 @@ -2308,7 +2308,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 @@ -2317,7 +2317,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 @@ -2326,7 +2326,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, SOUND_PAN_ATTACKER + playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_CONVERSION, 1, 1, RGB(31, 31, 13), 12, 0, 0 delay 6 createvisualtask AnimTask_ConversionAlphaBlend, 5 @@ -2342,7 +2342,7 @@ Move_CONVERSION_2: monbgprio_2A ANIM_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, SOUND_PAN_TARGET + playsewithpan SE_M_BARRIER, SOUND_PAN_TARGET createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 @@ -2361,21 +2361,21 @@ Move_CONVERSION_2: createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask AnimTask_Conversion2AlphaBlend, 5 delay 60 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -2387,14 +2387,14 @@ Move_ROLLING_KICK: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gSlidingKickSpriteTemplate, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish @@ -2406,7 +2406,7 @@ Move_ROLLING_KICK: Move_HEADBUTT: loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2415,7 +2415,7 @@ Move_HEADBUTT: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish end @@ -2423,7 +2423,7 @@ Move_HORN_ATTACK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2433,7 +2433,7 @@ Move_HORN_ATTACK: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish end @@ -2451,14 +2451,14 @@ FuryAttackRight: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto FuryAttackContinue Move_HORN_DRILL: @@ -2472,47 +2472,47 @@ HornDrillContinue: waitbgfadein setalpha 12, 8 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish - playse SE_BAN + playse SE_BANG createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 2, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -4, 3, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -8, -5, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 4, -12, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 16, 0, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, 18, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -17, 12, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -21, -15, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -27, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 0, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish @@ -2535,15 +2535,15 @@ Move_THRASH: createvisualtask AnimTask_ThrashMoveMonVertical, 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET end Move_SING: @@ -2551,7 +2551,7 @@ Move_SING: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish - panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SING, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 @@ -2590,7 +2590,7 @@ Move_LOW_KICK: delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end @@ -2598,7 +2598,7 @@ Move_LOW_KICK: Move_EARTHQUAKE: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 @@ -2609,7 +2609,7 @@ Move_FISSURE: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 - playsewithpan SE_W089, SOUND_PAN_TARGET + playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 call FissureDirtPlumeFar delay 15 @@ -2637,7 +2637,7 @@ FissureDirtPlumeFar: createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return FissureDirtPlumeClose: @@ -2645,7 +2645,7 @@ FissureDirtPlumeClose: createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return Move_DIG: @@ -2684,7 +2684,7 @@ DigUnleash: delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER clearmonbg ANIM_ATTACKER goto DigEnd DigThrowDirt: @@ -2692,16 +2692,16 @@ DigThrowDirt: createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground end @@ -2711,15 +2711,15 @@ Move_AGILITY: setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 10 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2733,11 +2733,11 @@ Move_QUICK_ATTACK: setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2751,16 +2751,16 @@ Move_RAGE: setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, TRUE, 1, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end @@ -2768,7 +2768,7 @@ Move_RAGE: Move_TELEPORT: call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 15 call UnsetPsychicBackground waitforvisualfinish @@ -2778,23 +2778,23 @@ Move_DOUBLE_TEAM: createvisualtask AnimTask_DoubleTeam, 2 setalpha 12, 8 monbg ANIM_ATK_PARTNER - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2804,7 +2804,7 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 10, 8 createvisualtask AnimTask_Minimize, 2 - loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 + loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end @@ -2813,11 +2813,11 @@ Move_METRONOME: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2832,7 +2832,7 @@ SkullBashSetUp: goto SkullBashEnd SkullBashSetUpHeadDown: createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2842,14 +2842,14 @@ SkullBashSetUpHeadDown: SkullBashAttack: loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd @@ -2859,9 +2859,9 @@ Move_AMNESIA: call SetPsychicBackground delay 8 createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call UnsetPsychicBackground end @@ -2869,18 +2869,18 @@ Move_AMNESIA: Move_KINESIS: loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsprite gBentSpoonSpriteTemplate, ANIM_ATTACKER, 20 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground end @@ -2889,14 +2889,14 @@ Move_GLARE: loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 createvisualtask AnimTask_ScaryFace, 5 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER delay 2 createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, FALSE waitforvisualfinish @@ -2906,12 +2906,12 @@ Move_GLARE: Move_BARRAGE: loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 24 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @@ -2930,7 +2930,7 @@ SkyAttackSetUpAgainstOpponent: delay 12 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16 - loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER, 4, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE delay 20 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE @@ -2946,7 +2946,7 @@ SkyAttackSetUpAgainstPartner: delay 12 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE delay 20 @@ -2966,11 +2966,11 @@ SkyAttackUnleash: delay 4 createvisualtask AnimTask_AttackerFadeToInvisible, 5, 0 waitforvisualfinish - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W327, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createsprite gSkyAttackBirdSpriteTemplate, ANIM_TARGET, 2 delay 14 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_AttackerFadeFromInvisible, 5, 1 delay 2 @@ -2981,7 +2981,7 @@ SkyAttackUnleash: goto SkyAttackEnd Move_FLASH: - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_Flash, 2 waitforvisualfinish end @@ -2989,7 +2989,7 @@ Move_FLASH: Move_SPLASH: createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2997,7 +2997,7 @@ Move_ACID_ARMOR: monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER - playsewithpan SE_W151, SOUND_PAN_ATTACKER + playsewithpan SE_M_ACID_ARMOR, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3013,7 +3013,7 @@ Move_SHARPEN: Move_SUPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 @@ -3022,7 +3022,7 @@ Move_SUPER_FANG: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 @@ -3033,11 +3033,11 @@ Move_SUPER_FANG: Move_SLASH: loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 4 createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish end @@ -3049,11 +3049,11 @@ Move_STRUGGLE: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3067,7 +3067,7 @@ Move_SKETCH: waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @@ -3077,7 +3077,7 @@ Move_NIGHTMARE: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_NightmareClone, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3086,7 +3086,7 @@ Move_NIGHTMARE: NightmareInContest: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3097,11 +3097,11 @@ Move_FLAIL: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3109,12 +3109,12 @@ Move_FLAIL: Move_SPITE: fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask AnimTask_SpiteTargetShadow, 2 - loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3135,11 +3135,11 @@ MachPunchContinue: delay 0 setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB(8, 9, 28), 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3160,13 +3160,13 @@ Move_FORESIGHT: setalpha 16, 0 createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET delay 17 - loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 + loopsewithpan SE_M_SKETCH, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, SOUND_PAN_TARGET + playsewithpan SE_M_DETECT, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -3175,16 +3175,16 @@ Move_FORESIGHT: Move_DESTINY_BOND: loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 48 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29) - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3194,7 +3194,7 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED @@ -3221,13 +3221,13 @@ Move_CHARM: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3242,7 +3242,7 @@ Move_ROLLOUT: waitforvisualfinish createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3252,44 +3252,44 @@ Move_FALSE_SWIPE: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 16 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_SWAGGER: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish end @@ -3300,14 +3300,14 @@ Move_MILK_DRINK: monbg ANIM_TARGET createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2 delay 40 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET call HealingEffect2 @@ -3324,12 +3324,12 @@ MagnitudeEnd: MagnitudeRegular: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto MagnitudeEnd MagnitudeIntense: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 @@ -3342,15 +3342,15 @@ Move_RAPID_SPIN: monbg ANIM_ATTACKER createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 10, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3364,7 +3364,7 @@ Move_MOONLIGHT: waitforvisualfinish createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56 createvisualtask AnimTask_AlphaFadeIn, 3, 0, 16, 16, 0, 1 - playsewithpan SE_W236, 0 + playsewithpan SE_M_MOONLIGHT, 0 delay 30 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0 delay 30 @@ -3393,7 +3393,7 @@ ExtremeSpeedContinue: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask AnimTask_AttackerStretchAndDisappear, 2 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2 @@ -3402,19 +3402,19 @@ ExtremeSpeedContinue: delay 18 createvisualtask AnimTask_ExtremeSpeedImpact, 2 delay 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -12, 3 delay 10 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, 3 delay 10 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 3 waitforvisualfinish createvisualtask AnimTask_SpeedDust, 2 delay 10 createvisualtask AnimTask_ExtremeSpeedMonReappear, 2 - loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3436,19 +3436,19 @@ Move_UPROAR: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3460,7 +3460,7 @@ Move_HEAT_WAVE: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED - panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HEAT_WAVE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 4 createvisualtask AnimTask_MoveHeatWaveTargets, 5 delay 12 @@ -3486,7 +3486,7 @@ Move_HAIL: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail, 5 - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 6, 0, RGB_BLACK end @@ -3498,10 +3498,10 @@ Move_TORMENT: waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_MEMENTO: @@ -3510,9 +3510,9 @@ Move_MEMENTO: createvisualtask AnimTask_InitMementoShadow, 2 delay 1 createvisualtask AnimTask_MoveAttackerMementoShadow, 5 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8114470, 2 delay 12 @@ -3520,7 +3520,7 @@ Move_MEMENTO: delay 1 monbg_22 ANIM_TARGET createvisualtask AnimTask_MoveTargetMementoShadow, 5 - playsewithpan SE_W060, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_TARGET delay 1 @@ -3532,7 +3532,7 @@ Move_FACADE: loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3 createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: @@ -3542,22 +3542,22 @@ Move_SMELLING_SALT: createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2 delay 32 createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3 - loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 + loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: @@ -3569,26 +3569,26 @@ Move_CHARGE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 + loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3600,19 +3600,19 @@ Move_TAUNT: loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_HELPING_HAND: @@ -3621,13 +3621,13 @@ Move_HELPING_HAND: createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end @@ -3637,16 +3637,16 @@ Move_ASSIST: createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 end Move_SUPERPOWER: @@ -3657,10 +3657,10 @@ Move_SUPERPOWER: monbgprio_28 ANIM_ATTACKER setalpha 12, 8 createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER delay 20 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W089, 0 + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_EARTHQUAKE, 0 delay 40 createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120 delay 8 @@ -3673,10 +3673,10 @@ Move_SUPERPOWER: createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, ANIM_ATTACKER - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3689,10 +3689,10 @@ Move_RECYCLE: setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3712,19 +3712,19 @@ BrickBreakNormal: delay 4 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3738,25 +3738,25 @@ BrickBreakShatteredWall: createsprite gBrickBreakWallSpriteTemplate, ANIM_ATTACKER, 3, ANIM_TARGET, 0, 0, 90, 10 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 2, -8, 12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 3, 8, 12 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3766,33 +3766,33 @@ BrickBreakShatteredWall: Move_YAWN: loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET - playsewithpan SE_W281, SOUND_PAN_TARGET + playsewithpan SE_M_YAWN, SOUND_PAN_TARGET end Move_ENDEAVOR: loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 delay 6 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 24 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, ANIM_TARGET, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_ERUPTION: @@ -3800,10 +3800,10 @@ Move_ERUPTION: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3815,7 +3815,7 @@ Move_ERUPTION: delay 22 createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60 - loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED end @@ -3825,7 +3825,7 @@ Move_SKILL_SWAP: call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, ANIM_TARGET createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask AnimTask_SkillSwap, 3, ANIM_ATTACKER createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 @@ -3840,12 +3840,12 @@ Move_IMPRISON: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_ImprisonOrbs, 5 delay 8 - loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground end @@ -3855,13 +3855,13 @@ Move_GRUDGE: monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask AnimTask_GrudgeFlames, 3 - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3875,7 +3875,7 @@ Move_CAMOUFLAGE: createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 4 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 @@ -3894,7 +3894,7 @@ Move_TAIL_GLOW: waitforvisualfinish createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, ANIM_ATTACKER delay 18 - loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 + loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3911,7 +3911,7 @@ Move_LUSTER_PURGE: waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, SOUND_PAN_ATTACKER + playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA @@ -3920,22 +3920,22 @@ Move_LUSTER_PURGE: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14 @@ -3949,14 +3949,14 @@ Move_MIST_BALL: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, SOUND_PAN_ATTACKER + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER createsprite gMistBallSpriteTemplate, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 3, 0, 16, RGB_WHITE delay 8 @@ -3969,7 +3969,7 @@ Move_FEATHER_DANCE: loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, SOUND_PAN_TARGET + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_TARGET delay 0 createsprite gFallingFeatherSpriteTemplate, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -3992,19 +3992,19 @@ Move_TEETER_DANCE: loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @@ -4013,52 +4013,52 @@ Move_MUD_SPORT: delay 24 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -4, -16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -3, -12 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -5, -18 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 25 + waitplaysewithpan SE_M_BUBBLE2, 0, 25 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 14 + waitplaysewithpan SE_M_BUBBLE2, 0, 14 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 end Move_NEEDLE_ARM: loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 @@ -4086,7 +4086,7 @@ Move_NEEDLE_ARM: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10 @@ -4100,7 +4100,7 @@ Move_NEEDLE_ARM: Move_SLACK_OFF: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish call HealingEffect waitforvisualfinish @@ -4117,18 +4117,18 @@ Move_CRUSH_CLAW: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 12 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_TARGET end Move_AROMATHERAPY: - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4152,15 +4152,15 @@ Move_AROMATHERAPY: delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) delay 1 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask AnimTask_StatusClearedEffect, 2, 1 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4173,7 +4173,7 @@ Move_FAKE_TEARS: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 12, 4 delay 8 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 1 @@ -4199,7 +4199,7 @@ Move_AIR_CUTTER: delay 0 createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 6 * 256, 2, 128 @ 6 * 256 == Q_8_8(6) waitforvisualfinish - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4215,15 +4215,15 @@ Move_ODOR_SLEUTH: createvisualtask AnimTask_OdorSleuthMovement, 5 delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @@ -4232,7 +4232,7 @@ Move_GRASS_WHISTLE: waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish - panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 @@ -4269,7 +4269,7 @@ Move_TICKLE: waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish @@ -4277,7 +4277,7 @@ Move_TICKLE: createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER delay 12 createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish end @@ -4287,13 +4287,13 @@ Move_WATER_SPOUT: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WaterSpoutLaunch, 5 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask AnimTask_WaterSpoutRain, 5 - playsewithpan SE_W057, SOUND_PAN_TARGET + playsewithpan SE_M_SURF, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4306,11 +4306,11 @@ Move_SHADOW_PUNCH: monbg ANIM_ATK_PARTNER setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB_BLACK, 13 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4325,15 +4325,15 @@ Move_EXTRASENSORY: setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 0 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_TransparentCloneGrowAndShrink, 5, ANIM_ATTACKER createvisualtask AnimTask_ExtrasensoryDistortion, 5, 2 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4347,18 +4347,18 @@ Move_AERIAL_ACE: createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish @@ -4367,7 +4367,7 @@ Move_IRON_DEFENSE: Move_BLOCK: loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET end Move_HOWL: @@ -4383,10 +4383,10 @@ Move_HOWL: Move_BULK_UP: loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4395,16 +4395,16 @@ Move_COVET: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: @@ -4416,28 +4416,28 @@ Move_VOLT_TACKLE: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask AnimTask_VoltTackleBolt, 5, 0 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 2 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 3 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 4 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 @@ -4445,7 +4445,7 @@ Move_VOLT_TACKLE: createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 @@ -4458,13 +4458,13 @@ Move_WATER_SPORT: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5 delay 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 end Move_CALM_MIND: @@ -4475,13 +4475,13 @@ Move_CALM_MIND: createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, TRUE waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, FALSE waitforvisualfinish @@ -4496,20 +4496,20 @@ Move_LEAF_BLADE: createvisualtask AnimTask_LeafBlade, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 createsprite gCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4521,7 +4521,7 @@ Move_DRAGON_DANCE: monbgprio_28 ANIM_ATTACKER delay 1 createvisualtask AnimTask_DragonDanceWaver, 5 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -4531,9 +4531,9 @@ Move_DRAGON_DANCE: createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 170 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -4549,7 +4549,7 @@ Move_SHOCK_WAVE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 12 createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 30 @@ -4557,7 +4557,7 @@ Move_SHOCK_WAVE: delay 12 waitforvisualfinish createvisualtask AnimTask_ShockWaveLightning, 5 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 createvisualtask AnimTask_BlendBattleAnimPal, 5, 1, 3, 16, 0, RGB_WHITE @@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE: end Move_HARDEN: - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish end @@ -4582,27 +4582,27 @@ Move_BELLY_DRUM: waitforvisualfinish call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 waitforvisualfinish @@ -4623,11 +4623,11 @@ Move_MIND_READER: loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg ANIM_DEF_PARTNER - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5 delay 40 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET createvisualtask AnimTask_BlendColorCycle, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEyeSpikeEffect waitforvisualfinish @@ -4667,7 +4667,7 @@ Move_ICE_PUNCH: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128 @@ -4680,7 +4680,7 @@ Move_ICE_PUNCH: delay 17 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish @@ -4696,7 +4696,7 @@ Move_ICE_PUNCH: end Move_REST: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4713,7 +4713,7 @@ Move_CONFUSION: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish - playsewithpan SE_W048, SOUND_PAN_TARGET + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4730,7 +4730,7 @@ Move_PSYCHIC: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish - loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 + loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4749,10 +4749,10 @@ FutureSightContinue: end FutureSight: monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish @@ -4769,7 +4769,7 @@ Move_THUNDER: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36 delay 1 @@ -4778,12 +4778,12 @@ Move_THUNDER: createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 12 delay 20 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -16 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 5 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 @@ -4798,7 +4798,7 @@ Move_THUNDER: createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 delay 1 @@ -4826,7 +4826,7 @@ Move_THUNDER_PUNCH: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 delay 1 @@ -4838,7 +4838,7 @@ Move_THUNDER_PUNCH: delay 1 createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 @@ -4854,7 +4854,7 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4875,13 +4875,13 @@ Move_SACRED_FIRE: createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 @@ -4889,7 +4889,7 @@ Move_SACRED_FIRE: waitforvisualfinish createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -4912,7 +4912,7 @@ Move_SCRATCH: loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -4925,7 +4925,7 @@ Move_DRAGON_BREATH: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 7 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 @@ -5007,7 +5007,7 @@ Move_SNORE: blendoff end SnoreEffect: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5020,7 +5020,7 @@ Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gLightScreenWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_GREEN_LIGHT_WALL delay 10 call SpecialScreenSparkle @@ -5049,7 +5049,7 @@ Move_MIRROR_COAT: setalpha 0, 16 createsprite gMirrorCoatWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_RED_LIGHT_WALL delay 10 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER call SpecialScreenSparkle waitforvisualfinish delay 1 @@ -5060,7 +5060,7 @@ Move_REFLECT: loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gReflectWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_BLUE_LIGHT_WALL delay 20 createsprite gReflectSparkleSpriteTemplate, ANIM_ATTACKER, 2, 30, 0, ANIM_ATTACKER, 1 @@ -5076,7 +5076,7 @@ Move_REFLECT: Move_BARRIER: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBarrierWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_GRAY_LIGHT_WALL waitforvisualfinish delay 1 @@ -5090,28 +5090,28 @@ Move_BUBBLE: setalpha 12, 8 delay 1 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubblesEffectLong waitforvisualfinish @@ -5124,7 +5124,7 @@ Move_SMOG: monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 17, 10 call SmogCloud call SmogCloud call SmogCloud @@ -5133,7 +5133,7 @@ Move_SMOG: call SmogCloud call SmogCloud delay 120 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 18, 2 createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 @@ -5152,7 +5152,7 @@ Move_FAINT_ATTACK: fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1 waitforvisualfinish @@ -5163,7 +5163,7 @@ Move_FAINT_ATTACK: setalpha 12, 8 monbg ANIM_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish @@ -5187,7 +5187,7 @@ Move_SAND_ATTACK: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5212,7 +5212,7 @@ SandAttackDirt: Move_MUD_SLAP: loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5236,14 +5236,14 @@ MudSlapMud: Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gDragonRageFireSpitSpriteTemplate, ANIM_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0 delay 1 @@ -5267,7 +5267,7 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 @@ -5284,7 +5284,7 @@ Move_BITE: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5303,14 +5303,14 @@ Move_CRUNCH: fadetobg BG_DARK waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5329,7 +5329,7 @@ Move_CLAMP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5348,7 +5348,7 @@ Move_ICE_BEAM: loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 delay 1 @@ -5386,7 +5386,7 @@ IceBeamCreateCrystals: return Move_WITHDRAW: - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createvisualtask AnimTask_Withdraw, 5 waitforvisualfinish end @@ -5395,7 +5395,7 @@ Move_AURORA_BEAM: loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORA waitbgfadein - playsewithpan SE_W062, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER setarg 7, 0 createvisualtask AnimTask_RotateAuroraRingColors, 10, 130 call AuroraBeamCreateRings @@ -5404,7 +5404,7 @@ Move_AURORA_BEAM: call AuroraBeamCreateRings call AuroraBeamCreateRings setarg 7, 0xFFFF - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 call AuroraBeamCreateRings call AuroraBeamCreateRings @@ -5437,7 +5437,7 @@ SolarBeamSetUp: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call SolarBeamAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -5475,7 +5475,7 @@ SolarBeamAbsorbEffect: return SolarBeamUnleash: call SetSolarbeamBg - panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5527,10 +5527,10 @@ BlizzardContinue: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call BlizzardIceCrystals call BlizzardIceCrystals - playsewithpan SE_W059B, SOUND_PAN_TARGET + playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET waitforvisualfinish call IceCrystalEffectLong waitforvisualfinish @@ -5573,10 +5573,10 @@ Move_POWDER_SNOW: monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call PowderSnowSnowballs call PowderSnowSnowballs - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish waitsound call IceCrystalEffectLong @@ -5610,7 +5610,7 @@ Move_HYDRO_PUMP: setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call HydroPumpBeams call HydroPumpBeams @@ -5655,7 +5655,7 @@ Move_SIGNAL_BEAM: loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_1B SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call SignalBeamOrbs call SignalBeamOrbs @@ -5699,7 +5699,7 @@ Move_ABSORB: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5717,28 +5717,28 @@ Move_ABSORB: end AbsorbEffect: - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5752,7 +5752,7 @@ Move_MEGA_DRAIN: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5770,35 +5770,35 @@ Move_MEGA_DRAIN: end MegaDrainAbsorbEffect: - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5813,7 +5813,7 @@ Move_GIGA_DRAIN: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5831,42 +5831,42 @@ Move_GIGA_DRAIN: end GigaDrainAbsorbEffect: - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -5886,7 +5886,7 @@ Move_LEECH_LIFE: createsprite gLeechLifeNeedleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish @@ -5906,7 +5906,7 @@ Move_LEECH_LIFE: Move_SYNTHESIS: loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 @@ -5928,22 +5928,22 @@ Move_TOXIC: end ToxicBubbles: createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 @@ -5970,19 +5970,19 @@ Move_SLUDGE_BOMB: createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 0, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5990,7 +5990,7 @@ Move_SLUDGE_BOMB: waitforvisualfinish end SludgeBombProjectile: - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -5999,31 +5999,31 @@ Move_ACID: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 15 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -6034,14 +6034,14 @@ Move_BONEMERANG: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_ATTACKER + playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER createsprite gBonemerangSpriteTemplate, ANIM_ATTACKER, 2 delay 20 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6054,13 +6054,13 @@ Move_BONE_CLUB: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6071,12 +6071,12 @@ Move_BONE_RUSH: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6085,15 +6085,15 @@ Move_BONE_RUSH: Move_SPIKES: loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6103,7 +6103,7 @@ Move_MEGAHORN: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout @@ -6118,7 +6118,7 @@ MegahornContinue: delay 3 createsprite gMegahornHornSpriteTemplate, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6148,13 +6148,13 @@ Move_GUST: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W016, SOUND_PAN_TARGET + playsewithpan SE_M_GUST, SOUND_PAN_TARGET createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6166,7 +6166,7 @@ Move_WING_ATTACK: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6176,7 +6176,7 @@ Move_WING_ATTACK: delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6186,7 +6186,7 @@ Move_WING_ATTACK: Move_PECK: loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, ANIM_TARGET, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, ANIM_TARGET, 3 waitforvisualfinish @@ -6207,7 +6207,7 @@ Move_AEROBLAST: call AeroblastBeam waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6215,19 +6215,19 @@ Move_AEROBLAST: call UnsetSkyBg end AeroblastBeam: - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 @@ -6240,18 +6240,18 @@ Move_WATER_GUN: monbgprio_28 ANIM_TARGET setalpha 12, 8 createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6263,7 +6263,7 @@ Move_CRABHAMMER: monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6272,7 +6272,7 @@ Move_CRABHAMMER: waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, ANIM_TARGET delay 4 @@ -6297,7 +6297,7 @@ Move_CRABHAMMER: Move_SURF: createvisualtask AnimTask_CreateSurfWave, 2, FALSE delay 24 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 waitforvisualfinish end @@ -6309,7 +6309,7 @@ Move_FLAMETHROWER: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call FlamethrowerCreateFlames call FlamethrowerCreateFlames call FlamethrowerCreateFlames @@ -6337,7 +6337,7 @@ FlamethrowerCreateFlames: @ Also used by Sandstorm weather Move_SANDSTORM: loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0 @@ -6362,7 +6362,7 @@ Move_WHIRLPOOL: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -6397,19 +6397,19 @@ FlyEnd: end FlySetUp: - playsewithpan SE_W019, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6423,17 +6423,17 @@ BounceEnd: end BounceSetUp: - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3 delay 7 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish @@ -6447,10 +6447,10 @@ Move_KARATE_CHOP: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish @@ -6463,11 +6463,11 @@ Move_CROSS_CHOP: loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 @@ -6484,11 +6484,11 @@ Move_JUMP_KICK: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6505,10 +6505,10 @@ Move_HI_JUMP_KICK: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 @@ -6527,7 +6527,7 @@ Move_DOUBLE_KICK: setalpha 12, 8 createsprite gFistFootRandomPosSpriteTemplate, ANIM_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6538,7 +6538,7 @@ Move_TRIPLE_KICK: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter @@ -6574,26 +6574,26 @@ Move_DYNAMIC_PUNCH: delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6606,23 +6606,23 @@ Move_COUNTER: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6636,13 +6636,13 @@ Move_VITAL_THROW: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6664,10 +6664,10 @@ Move_ROCK_SMASH: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2 @@ -6686,16 +6686,16 @@ Move_SUBMISSION: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call SubmissionHit @@ -6722,7 +6722,7 @@ Move_SUNNY_DAY: setalpha 13, 3 createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_26 SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDayLightRay call SunnyDayLightRay call SunnyDayLightRay @@ -6743,7 +6743,7 @@ Move_COTTON_SPORE: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10 call CreateCottonSpores call CreateCottonSpores call CreateCottonSpores @@ -6765,7 +6765,7 @@ Move_SPORE: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 16, 11 call CreateSpore call CreateSpore call CreateSpore @@ -6789,7 +6789,7 @@ Move_PETAL_DANCE: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, SOUND_PAN_ATTACKER + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 @@ -6811,7 +6811,7 @@ Move_PETAL_DANCE: waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish @@ -6829,7 +6829,7 @@ Move_RAZOR_LEAF: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 @@ -6850,11 +6850,11 @@ Move_RAZOR_LEAF: delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6878,7 +6878,7 @@ Move_ANCIENT_POWER: createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -6888,7 +6888,7 @@ Move_ANCIENT_POWER: waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -6901,10 +6901,10 @@ Move_ANCIENT_POWER: Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 @@ -6919,7 +6919,7 @@ Move_MIST: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 + loopsewithpan SE_M_MIST, SOUND_PAN_ATTACKER, 20, 15 call MistCloud call MistCloud call MistCloud @@ -6941,7 +6941,7 @@ MistCloud: Move_HAZE: waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_HazeScrollingFog, 5 delay 30 createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 2, 0, 16, RGB_BLACK @@ -6960,14 +6960,14 @@ Move_FIRE_PUNCH: createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 196 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 call FireSpreadEffect delay 4 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish @@ -6990,7 +6990,7 @@ Move_LEER: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish @@ -7009,10 +7009,10 @@ Move_DREAM_EATER: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, SOUND_PAN_TARGET + playsewithpan SE_M_MINIMIZE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -7029,42 +7029,42 @@ Move_DREAM_EATER: call UnsetPsychicBackground end DreamEaterAbsorb: - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -7079,25 +7079,25 @@ Move_POISON_GAS: monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6 createvisualtask AnimTask_BlendColorCycle, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff @@ -7110,7 +7110,7 @@ Move_BIND: goto BindWrap BindWrap: - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET call BindWrapSqueezeTarget call BindWrapSqueezeTarget waitforvisualfinish @@ -7126,9 +7126,9 @@ Move_WRAP: Move_PSYBEAM: loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 call PsybeamRings call PsybeamRings createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET @@ -7163,7 +7163,7 @@ Move_HYPNOSIS: call UnsetPsychicBackground end HypnosisRings: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7171,10 +7171,10 @@ HypnosisRings: Move_PSYWAVE: loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TELEPORT, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 call PsywaveRings call PsywaveRings createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) @@ -7196,7 +7196,7 @@ PsywaveRings: Move_ZAP_CANNON: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 @@ -7209,7 +7209,7 @@ Move_ZAP_CANNON: waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end @@ -7217,13 +7217,13 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7233,7 +7233,7 @@ Move_STEEL_WING: delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7243,7 +7243,7 @@ Move_STEEL_WING: Move_IRON_TAIL: loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET @@ -7252,7 +7252,7 @@ Move_IRON_TAIL: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 clearmonbg ANIM_TARGET @@ -7263,7 +7263,7 @@ Move_IRON_TAIL: Move_POISON_TAIL: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET @@ -7272,7 +7272,7 @@ Move_POISON_TAIL: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 clearmonbg ANIM_TARGET @@ -7283,19 +7283,19 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -7305,11 +7305,11 @@ Move_METAL_CLAW: Move_NIGHT_SHADE: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_NightShadeClone, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 @@ -7324,24 +7324,24 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 waitforvisualfinish end @@ -7351,10 +7351,10 @@ Move_SHADOW_BALL: fadetobg BG_GHOST waitbgfadein delay 15 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_MIST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7364,7 +7364,7 @@ Move_SHADOW_BALL: Move_LICK: loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, SOUND_PAN_TARGET + playsewithpan SE_M_LICK, SOUND_PAN_TARGET createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish @@ -7372,7 +7372,7 @@ Move_LICK: Move_FOCUS_ENERGY: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_WHITE @@ -7387,7 +7387,7 @@ Move_BIDE: choosetwoturnanim BideSetUp, BideUnleash end BideSetUp: - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7397,7 +7397,7 @@ BideUnleash: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7405,13 +7405,13 @@ BideUnleash: waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, ANIM_TARGET, 1 waitforvisualfinish delay 5 @@ -7430,7 +7430,7 @@ Move_STRING_SHOT: delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call StringShotThread call StringShotThread call StringShotThread @@ -7450,7 +7450,7 @@ Move_STRING_SHOT: call StringShotThread call StringShotThread waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10 delay 4 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2 @@ -7476,7 +7476,7 @@ Move_SPIDER_WEB: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call SpiderWebThread call SpiderWebThread call SpiderWebThread @@ -7492,7 +7492,7 @@ Move_SPIDER_WEB: call SpiderWebThread call SpiderWebThread waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -7513,12 +7513,12 @@ RazorWindEnd: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER goto RazorWindEnd RazorWindUnleash: @@ -7526,16 +7526,16 @@ RazorWindUnleash: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7548,11 +7548,11 @@ Move_DISABLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask AnimTask_GrowAndGreyscale, 5 - loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 + loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_TARGET @@ -7564,7 +7564,7 @@ Move_RECOVER: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 + loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) call RecoverAbsorbEffect call RecoverAbsorbEffect @@ -7599,14 +7599,14 @@ Move_MIMIC: setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + panse_1B SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24 delay 15 createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, 0xFFFF waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER @@ -7615,7 +7615,7 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 @@ -7625,7 +7625,7 @@ Move_CONSTRICT: delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET setarg 7, 0xFFFF waitforvisualfinish end @@ -7650,7 +7650,7 @@ CurseGhost: clearmonbg ANIM_ATK_PARTNER delay 1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -7660,7 +7660,7 @@ CurseGhost: end CurseGhostShakeFromNail: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, SOUND_PAN_ATTACKER + playsewithpan SE_M_BIND, SOUND_PAN_ATTACKER return CurseStats: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER @@ -7670,7 +7670,7 @@ CurseStats: waitforvisualfinish end CurseStats1: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_DrawFallingWhiteLinesOnAttacker, 5 createvisualtask AnimTask_BlendColorCycle, 5, 2, 4, 2, 0, 10, RGB_RED return @@ -7680,13 +7680,13 @@ Move_SOFT_BOILED: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, SOUND_PAN_ATTACKER + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7731,14 +7731,14 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 @@ -7747,14 +7747,14 @@ HealBellRing: createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER return Move_FAKE_OUT: - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5 waitforvisualfinish - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 waitforvisualfinish @@ -7764,17 +7764,17 @@ Move_FAKE_OUT: Move_SCARY_FACE: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaryFace, 5 delay 13 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, FALSE - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end @@ -7783,14 +7783,14 @@ Move_SWEET_KISS: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET waitforvisualfinish createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7802,9 +7802,9 @@ Move_LOVELY_KISS: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 - playsewithpan SE_W060B, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7815,13 +7815,13 @@ Move_FURY_SWIPES: loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end @@ -7830,28 +7830,28 @@ Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 40 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end @@ -7860,13 +7860,13 @@ Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE2, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET waitforvisualfinish jumpretfalse PresentDamage jumprettrue PresentHeal @@ -7874,26 +7874,26 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, SOUND_PAN_TARGET + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 @@ -7918,7 +7918,7 @@ PresentHeal: Move_BATON_PASS: loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, SOUND_PAN_ATTACKER + playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2 end @@ -7943,7 +7943,7 @@ Move_PERISH_SONG: createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0 @@ -7964,21 +7964,21 @@ Move_SLEEP_TALK: createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -7988,7 +7988,7 @@ Move_SLEEP_TALK: Move_HYPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask AnimTask_IsContest, 2 @@ -8001,7 +8001,7 @@ HyperFangContinue: createsprite gFangSpriteTemplate, ANIM_TARGET, 2 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein @@ -8020,17 +8020,17 @@ HyperFangInContest: Move_TRI_ATTACK: loadspritegfx ANIM_TAG_TRI_ATTACK_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8049,7 +8049,7 @@ Move_TRI_ATTACK: waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 @@ -8071,8 +8071,8 @@ Move_WILL_O_WISP: loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W052, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 + playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 10 createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8085,7 +8085,7 @@ Move_WILL_O_WISP: createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42 @@ -8109,7 +8109,7 @@ Move_ENCORE: createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 @@ -8123,23 +8123,23 @@ Move_TRICK: createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 - playsewithpan SE_W166, 0 + playsewithpan SE_M_SKETCH, 0 createvisualtask AnimTask_StretchTargetUp, 3 createvisualtask AnimTask_StretchAttackerUp, 3 delay 30 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 24 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W213, 0 + playsewithpan SE_M_ATTRACT, 0 createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 waitforvisualfinish @@ -8150,11 +8150,11 @@ Move_WISH: loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + panse_27 SE_M_REFLECT, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3 call GrantingStarsEffect waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK @@ -8163,7 +8163,7 @@ Move_WISH: Move_STOCKPILE: loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5 call StockpileAbsorb @@ -8193,11 +8193,11 @@ StockpileAbsorb: Move_SPIT_UP: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_SpitUpDeformMon, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 3 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 @@ -8213,10 +8213,10 @@ Move_SPIT_UP: SpitUpContinue: delay 5 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 8, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 10, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, -10, ANIM_TARGET, 1 waitforvisualfinish end @@ -8240,11 +8240,11 @@ SpitUpStrongest: Move_SWALLOW: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_SwallowDeformMon, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood @@ -8275,8 +8275,8 @@ SwallowBest: Move_TRANSFORM: monbg ANIM_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask AnimTask_TransformMon, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8316,7 +8316,7 @@ MorningSunStar: Move_SWEET_SCENT: loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8357,11 +8357,11 @@ Move_HYPER_BEAM: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 call HyperBeamOrbs @@ -8405,7 +8405,7 @@ HyperBeamOrbs: Move_FLATTER: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_CONFETTI - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8415,7 +8415,7 @@ Move_FLATTER: delay 10 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_ATTACKER call CreateFlatterConfetti call CreateFlatterConfetti call CreateFlatterConfetti @@ -8436,7 +8436,7 @@ Move_FLATTER: call CreateFlatterConfetti call CreateFlatterConfetti delay 5 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 waitforvisualfinish @@ -8452,8 +8452,8 @@ Move_ROLE_PLAY: createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W161, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_DETECT, SOUND_PAN_ATTACKER, 30 createvisualtask AnimTask_RolePlaySilhouette, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -8465,13 +8465,13 @@ Move_ROLE_PLAY: Move_REFRESH: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask AnimTask_StatusClearedEffect, 2, 0 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end @@ -8482,11 +8482,11 @@ Move_BLAZE_KICK: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 30 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE @@ -8521,7 +8521,7 @@ Move_SAND_TOMB: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call SandTombSwirlingDirt call SandTombSwirlingDirt call SandTombSwirlingDirt @@ -8548,14 +8548,14 @@ SandTombSwirlingDirt: Move_SHEER_COLD: fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_FrozenIceCube, 2 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8572,11 +8572,11 @@ Move_ARM_THRUST: delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 @@ -8591,7 +8591,7 @@ ArmThrustLeft: goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSurfWave, 2, TRUE waitforvisualfinish end @@ -8624,7 +8624,7 @@ Move_BULLET_SEED: Move_DRAGON_CLAW: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 call DragonClawFireSpiral @@ -8632,7 +8632,7 @@ Move_DRAGON_CLAW: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER delay 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -8645,7 +8645,7 @@ Move_DRAGON_CLAW: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, ANIM_ATTACKER delay 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -8689,7 +8689,7 @@ Move_MUD_SHOT: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call MudShotOrbs call MudShotOrbs call MudShotOrbs @@ -8717,7 +8717,7 @@ Move_METEOR_MASH: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 + panse_1B SE_M_BARRIER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish @@ -8728,7 +8728,7 @@ Move_METEOR_MASH: createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 30 createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish @@ -8742,7 +8742,7 @@ Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gRevengeSmallScratchSpriteTemplate, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 4, 2, 8, RGB_RED @@ -8751,17 +8751,17 @@ Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gRevengeBigScratchSpriteTemplate, ANIM_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 8, ANIM_TARGET, 1, 8 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8770,7 +8770,7 @@ Move_REVENGE: Move_POISON_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gFangSpriteTemplate, ANIM_TARGET, 2 delay 10 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 @@ -8781,7 +8781,7 @@ Move_POISON_FANG: end Move_SUBSTITUTE: - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER createvisualtask AnimTask_MonToSubstitute, 2 end @@ -8794,50 +8794,50 @@ Move_FRENZY_PLANT: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, -43 + playsewithpan SE_M_SCRATCH, -43 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, -22 + playsewithpan SE_M_SCRATCH, -22 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 - playsewithpan SE_W010, +21 + playsewithpan SE_M_SCRATCH, +21 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 - playsewithpan SE_W010, +42 + playsewithpan SE_M_SCRATCH, +42 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, ANIM_TARGET, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, ANIM_TARGET, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, ANIM_TARGET, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, ANIM_TARGET, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish @@ -8860,7 +8860,7 @@ Move_METAL_SOUND: waitforvisualfinish end MetalSoundRings: - panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8883,20 +8883,20 @@ FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gFocusPunchFistSpriteTemplate, ANIM_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, ANIM_TARGET, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -8930,94 +8930,94 @@ ReturnContinue: end ReturnWeak: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W004, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_COMET_PUNCH, SOUND_PAN_TARGET goto ReturnContinue ReturnMedium: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish delay 11 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET goto ReturnContinue ReturnStrong: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto ReturnContinue ReturnStrongest: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 12, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 4 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 2 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish @@ -9026,25 +9026,25 @@ ReturnStrongest: call ReturnStrongestHit call ReturnStrongestHit createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK goto ReturnContinue ReturnStrongestHit: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish @@ -9052,8 +9052,8 @@ ReturnStrongestHit: Move_COSMIC_POWER: loadspritegfx ANIM_TAG_SPARKLE_2 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W322, 0 - playsewithpan SE_W322, 0 + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_COSMIC_POWER, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 0, 0, 15, RGB_BLACK waitforvisualfinish fadetobg BG_COSMIC @@ -9061,7 +9061,7 @@ Move_COSMIC_POWER: createvisualtask AnimTask_StartSlidingBg, 2, 0, 128, 0, -1 waitbgfadein delay 70 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W234, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 @@ -9080,7 +9080,7 @@ Move_BLAST_BURN: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0 @@ -9090,7 +9090,7 @@ Move_BLAST_BURN: createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0 @@ -9102,7 +9102,7 @@ Move_BLAST_BURN: createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0 @@ -9128,24 +9128,24 @@ Move_ROCK_TOMB: createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, ANIM_TARGET, 50 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -9154,8 +9154,8 @@ Move_ROCK_TOMB: Move_SILVER_WIND: loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 @@ -9194,7 +9194,7 @@ SilverWindContinue: createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER delay 0 restorebg @@ -9210,7 +9210,7 @@ SilverWindOnPlayer: goto SilverWindContinue Move_SNATCH: - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end @@ -9220,10 +9220,10 @@ Move_DIVE: choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0 call DiveSetUpWaterDroplets call DiveSetUpWaterDroplets @@ -9240,7 +9240,7 @@ DiveAttack: loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, SOUND_PAN_TARGET + playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1 call DiveAttackWaterDroplets call DiveAttackWaterDroplets @@ -9264,11 +9264,11 @@ Move_ROCK_BLAST: loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9290,13 +9290,13 @@ Move_OVERHEAT: delay 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0 delay 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20 @@ -9326,17 +9326,17 @@ Move_OVERHEAT: delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) @@ -9363,12 +9363,12 @@ Move_HYDRO_CANNON: loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2 delay 10 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call HydroCannonBeam createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 @@ -9402,11 +9402,11 @@ HydroCannonBeam: Move_ASTONISH: loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, SOUND_PAN_ATTACKER + playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 @@ -9425,7 +9425,7 @@ Move_SEISMIC_TOSS: fadetobg BG_IN_AIR waitbgfadeout createvisualtask AnimTask_MoveSeismicTossBg, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 @@ -9463,7 +9463,7 @@ SeismicTossStrong: goto SeismicTossContinue SeismicTossRockScatter1: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 @@ -9472,7 +9472,7 @@ SeismicTossRockScatter1: return SeismicTossRockScatter2: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, ANIM_TARGET, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2 @@ -9483,7 +9483,7 @@ SeismicTossRockScatter2: Move_MAGIC_COAT: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gMagicCoatWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_ORANGE_LIGHT_WALL waitforvisualfinish delay 1 @@ -9495,7 +9495,7 @@ Move_WATER_PULSE: loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9503,15 +9503,15 @@ Move_WATER_PULSE: createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 @@ -9535,13 +9535,13 @@ Move_PSYCHO_BOOST: setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 14, 10 createsprite gPsychoBoostOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9553,12 +9553,12 @@ Move_KNOCK_OFF: loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9577,7 +9577,7 @@ Move_DOOM_DESIRE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish delay 20 @@ -9594,7 +9594,7 @@ Move_SKY_UPPERCUT: monbgprio_28 ANIM_TARGET fadetobg BG_IN_AIR waitbgfadeout - playsewithpan SE_W327, SOUND_PAN_ATTACKER + playsewithpan SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createvisualtask AnimTask_MoveSkyUppercutBg, 5, 55 waitbgfadein setalpha 12, 8 @@ -9602,20 +9602,20 @@ Move_SKY_UPPERCUT: createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, ANIM_TARGET, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9651,7 +9651,7 @@ Move_TWISTER: loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - playsewithpan SE_W239, SOUND_PAN_TARGET + playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 @@ -9674,18 +9674,18 @@ Move_TWISTER: createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9698,7 +9698,7 @@ Move_MAGICAL_LEAF: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createvisualtask AnimTask_CycleMagicalLeafPal, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9720,11 +9720,11 @@ Move_MAGICAL_LEAF: delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, ANIM_TARGET, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -9741,10 +9741,10 @@ Move_ICE_BALL: createvisualtask AnimTask_GetIceBallCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET createvisualtask AnimTask_GetIceBallCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest jumpargeq 0, 1, IceBallWeak @@ -9829,11 +9829,11 @@ Move_WEATHER_BALL: loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gWeatherBallUpSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 - playsewithpan SE_W197, 0 + playsewithpan SE_M_DETECT, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 @@ -9847,7 +9847,7 @@ WeatherBallNormal: loadspritegfx ANIM_TAG_IMPACT createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish @@ -9855,45 +9855,45 @@ WeatherBallNormal: WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallWater: loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 8 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 13 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET waitforvisualfinish end WeatherBallSandstorm: loadspritegfx ANIM_TAG_ROCKS createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 5 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 14 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 30, 2, 3 @@ -9905,16 +9905,16 @@ WeatherBallIce: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET call IceCrystalEffectShort waitforvisualfinish end @@ -9923,7 +9923,7 @@ Move_COUNT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -9933,64 +9933,64 @@ Move_COUNT: IceCrystalEffectShort: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return IceCrystalEffectLong: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return IceSpikesEffectShort: @ Unused - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 0 @@ -10007,7 +10007,7 @@ IceSpikesEffectShort: @ Unused return IceSpikesEffectLong: - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 1 @@ -10037,7 +10037,7 @@ GrantingStarsEffect: return HealingEffect: - playsewithpan SE_W071B, SOUND_PAN_ATTACKER + playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 @@ -10049,7 +10049,7 @@ HealingEffect: return HealingEffect2: - playsewithpan SE_W071B, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB_2, SOUND_PAN_TARGET createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 @@ -10062,72 +10062,72 @@ HealingEffect2: PoisonBubblesEffect: createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET return WaterBubblesEffectShort: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return WaterBubblesEffectLong: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return ElectricityEffect: - playsewithpan SE_W085B, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 @@ -10146,7 +10146,7 @@ ElectricityEffect: return ConfusionEffect: - loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90 @@ -10214,7 +10214,7 @@ UnsetSolarbeamBg: return Status_Poison: - loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10226,7 +10226,7 @@ Status_Confusion: Status_Burn: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call BurnFlame call BurnFlame call BurnFlame @@ -10239,19 +10239,19 @@ BurnFlame: Status_Infatuation: loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10264,11 +10264,11 @@ Status_Paralysis: end Status_Freeze: - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 createvisualtask AnimTask_FrozenIceCube, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10277,7 +10277,7 @@ Status_Freeze: Status_Curse: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10287,7 +10287,7 @@ Status_Curse: Status_Nightmare: loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gNightmareDevilSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10300,8 +10300,8 @@ General_CastformChange: goto CastformChangeContinue CastformChangeContinue: monbg ANIM_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask AnimTask_TransformMon, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10336,10 +10336,10 @@ General_PokeblockThrow: createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0 createvisualtask AnimTask_LoadPokeblockGfx, 2 delay 0 - waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22 createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish createvisualtask AnimTask_FreePokeblockGfx, 2 @@ -10359,7 +10359,7 @@ General_TurnTrap: goto Status_BindWrap Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 @@ -10367,13 +10367,13 @@ Status_BindWrap: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, 0xFFFF - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish end Status_FireSpin: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect @@ -10388,7 +10388,7 @@ Status_Whirlpool: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -10404,7 +10404,7 @@ Status_Clamp: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10420,7 +10420,7 @@ Status_SandTomb: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call SandTombSwirlingDirt call SandTombSwirlingDirt delay 22 @@ -10433,19 +10433,19 @@ General_HeldItemEffect: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10456,23 +10456,23 @@ General_SmokeballEscape: monbg ANIM_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createvisualtask AnimTask_AttackerFadeToInvisible, 2, 2 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46 @@ -10491,7 +10491,7 @@ General_SmokeballEscape: General_FocusBand: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED @@ -10502,7 +10502,7 @@ General_FocusBand: General_Rain: loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 @@ -10531,7 +10531,7 @@ General_MonHit: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -10562,22 +10562,22 @@ SnatchMoveContinue: call SnatchMoveTrySwapToSubstitute end SnatchOpposingMonMove: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchOpposingMonMove, 2 goto SnatchMoveContinue SnatchPartnerMonMove: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchPartnerMove, 2 goto SnatchMoveContinue General_FutureSightHit: createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -10598,26 +10598,26 @@ General_DoomDesireHit: delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5 delay 9 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -10626,7 +10626,7 @@ General_DoomDesireHit: General_FocusPunchSetUp: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED @@ -10660,7 +10660,7 @@ General_WishHeal: loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 @@ -10694,7 +10694,7 @@ SnatchMoveSwapMonForSubstitute: @ Healthbox blue flash effect on level up Special_LevelUp: - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2 delay 0 createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0 @@ -10717,7 +10717,7 @@ Special_SwitchOutOpponentMon: Special_BallThrow: createvisualtask AnimTask_LoadBallGfx, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask AnimTask_ThrowBall, 2 createvisualtask AnimTask_IsBallBlockedByTrainer, 2 jumpreteq -1, BallThrowTrainerBlock @@ -10731,17 +10731,17 @@ BallThrowTrainerBlock: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, ANIM_TARGET, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff goto BallThrowEnd -Special_SafariBallThrow: +Special_BallThrowWithTrainer: createvisualtask AnimTask_LoadBallGfx, 2 delay 0 - createvisualtask AnimTask_ThrowBallSpecial, 2 + createvisualtask AnimTask_ThrowBall_StandingTrainer, 2 waitforvisualfinish createvisualtask AnimTask_FreeBallGfx, 2 end diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index f0c0a7ea85..873425c638 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3165,7 +3165,7 @@ BattleScript_Pausex20:: return BattleScript_LevelUp:: - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0x0 drawlvlupbox @@ -3193,7 +3193,7 @@ BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_ANDELLIPSIS BattleScript_LearnedNewMove:: buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNLEARNEDMOVE waitmessage 0x40 updatechoicemoveonlvlup BS_ATTACKER @@ -4459,9 +4459,9 @@ BattleScript_PalaceEndFlavorText:: BattleScript_ArenaTurnBeginning:: waitcry BS_ATTACKER volumedown - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x8 - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 various14 BS_ATTACKER arenajudmengtstring 8 arenawaitmessage 8 @@ -4471,7 +4471,7 @@ BattleScript_ArenaTurnBeginning:: end2 BattleScript_82DB8E0:: @ Unused battlescript - playse SE_PINPON + playse SE_DING_DONG various14 BS_ATTACKER arenajudmengtstring BS_TARGET arenawaitmessage BS_TARGET @@ -4485,9 +4485,9 @@ BattleScript_ArenaDoJudgment:: makevisible BS_OPPONENT1 waitstate volumedown - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x8 - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x40 various14 BS_ATTACKER arenajudmengtstring 1 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 316b4df25b..caa6cddac9 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -118,7 +118,7 @@ BattleScript_PlayerUsesItem:: BattleScript_OpponentUsesHealItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -135,7 +135,7 @@ BattleScript_OpponentUsesHealItem:: BattleScript_OpponentUsesStatusCureItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -149,7 +149,7 @@ BattleScript_OpponentUsesStatusCureItem:: BattleScript_OpponentUsesXItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -162,7 +162,7 @@ BattleScript_OpponentUsesXItem:: BattleScript_OpponentUsesGuardSpecs:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -173,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs:: finishaction BattleScript_RunByUsingItem:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn diff --git a/data/event_scripts.s b/data/event_scripts.s index 058de953be..8039be6876 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -151,13 +151,13 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/Route132/scripts.inc" .include "data/maps/Route133/scripts.inc" .include "data/maps/Route134/scripts.inc" - .include "data/maps/Underwater1/scripts.inc" - .include "data/maps/Underwater2/scripts.inc" - .include "data/maps/Underwater3/scripts.inc" - .include "data/maps/Underwater4/scripts.inc" - .include "data/maps/Underwater5/scripts.inc" - .include "data/maps/Underwater6/scripts.inc" - .include "data/maps/Underwater7/scripts.inc" + .include "data/maps/Underwater_Route124/scripts.inc" + .include "data/maps/Underwater_Route126/scripts.inc" + .include "data/maps/Underwater_Route127/scripts.inc" + .include "data/maps/Underwater_Route128/scripts.inc" + .include "data/maps/Underwater_Route129/scripts.inc" + .include "data/maps/Underwater_Route105/scripts.inc" + .include "data/maps/Underwater_Route125/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" @@ -713,13 +713,13 @@ Common_EventScript_SetAbnormalWeather:: @ 827207A return Common_EventScript_PlayGymBadgeFanfare:: @ 827207E - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty fadescreen FADE_FROM_BLACK @@ -736,7 +736,7 @@ EventScript_RegionMap:: @ 827208F Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, 0 + playbgm MUS_SAILING, 0 return Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 @@ -820,7 +820,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 82723DD Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message gText_PlayerHandedOverTheItem waitmessage waitfanfare diff --git a/data/layouts/Underwater1/border.bin b/data/layouts/Underwater_Route105/border.bin similarity index 100% rename from data/layouts/Underwater1/border.bin rename to data/layouts/Underwater_Route105/border.bin diff --git a/data/layouts/Underwater6/map.bin b/data/layouts/Underwater_Route105/map.bin similarity index 100% rename from data/layouts/Underwater6/map.bin rename to data/layouts/Underwater_Route105/map.bin diff --git a/data/layouts/Underwater2/border.bin b/data/layouts/Underwater_Route124/border.bin similarity index 100% rename from data/layouts/Underwater2/border.bin rename to data/layouts/Underwater_Route124/border.bin diff --git a/data/layouts/Underwater1/map.bin b/data/layouts/Underwater_Route124/map.bin similarity index 100% rename from data/layouts/Underwater1/map.bin rename to data/layouts/Underwater_Route124/map.bin diff --git a/data/layouts/Underwater3/border.bin b/data/layouts/Underwater_Route125/border.bin similarity index 100% rename from data/layouts/Underwater3/border.bin rename to data/layouts/Underwater_Route125/border.bin diff --git a/data/layouts/Underwater7/map.bin b/data/layouts/Underwater_Route125/map.bin similarity index 100% rename from data/layouts/Underwater7/map.bin rename to data/layouts/Underwater_Route125/map.bin diff --git a/data/layouts/Underwater4/border.bin b/data/layouts/Underwater_Route126/border.bin similarity index 100% rename from data/layouts/Underwater4/border.bin rename to data/layouts/Underwater_Route126/border.bin diff --git a/data/layouts/Underwater2/map.bin b/data/layouts/Underwater_Route126/map.bin similarity index 100% rename from data/layouts/Underwater2/map.bin rename to data/layouts/Underwater_Route126/map.bin diff --git a/data/layouts/Underwater5/border.bin b/data/layouts/Underwater_Route127/border.bin similarity index 100% rename from data/layouts/Underwater5/border.bin rename to data/layouts/Underwater_Route127/border.bin diff --git a/data/layouts/Underwater3/map.bin b/data/layouts/Underwater_Route127/map.bin similarity index 100% rename from data/layouts/Underwater3/map.bin rename to data/layouts/Underwater_Route127/map.bin diff --git a/data/layouts/Underwater6/border.bin b/data/layouts/Underwater_Route128/border.bin similarity index 100% rename from data/layouts/Underwater6/border.bin rename to data/layouts/Underwater_Route128/border.bin diff --git a/data/layouts/Underwater4/map.bin b/data/layouts/Underwater_Route128/map.bin similarity index 100% rename from data/layouts/Underwater4/map.bin rename to data/layouts/Underwater_Route128/map.bin diff --git a/data/layouts/Underwater7/border.bin b/data/layouts/Underwater_Route129/border.bin similarity index 100% rename from data/layouts/Underwater7/border.bin rename to data/layouts/Underwater_Route129/border.bin diff --git a/data/layouts/Underwater5/map.bin b/data/layouts/Underwater_Route129/map.bin similarity index 100% rename from data/layouts/Underwater5/map.bin rename to data/layouts/Underwater_Route129/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b2ebeb5c61..9292e10afe 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -502,34 +502,34 @@ "blockdata_filepath": "data/layouts/Route134/map.bin" }, { - "id": "LAYOUT_UNDERWATER2", - "name": "Underwater2_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE126", + "name": "Underwater_Route126_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater2/border.bin", - "blockdata_filepath": "data/layouts/Underwater2/map.bin" + "border_filepath": "data/layouts/Underwater_Route126/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route126/map.bin" }, { - "id": "LAYOUT_UNDERWATER3", - "name": "Underwater3_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE127", + "name": "Underwater_Route127_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater3/border.bin", - "blockdata_filepath": "data/layouts/Underwater3/map.bin" + "border_filepath": "data/layouts/Underwater_Route127/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route127/map.bin" }, { - "id": "LAYOUT_UNDERWATER4", - "name": "Underwater4_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE128", + "name": "Underwater_Route128_Layout", "width": 120, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater4/border.bin", - "blockdata_filepath": "data/layouts/Underwater4/map.bin" + "border_filepath": "data/layouts/Underwater_Route128/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route128/map.bin" }, { "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", @@ -2732,14 +2732,14 @@ "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" }, { - "id": "LAYOUT_UNDERWATER1", - "name": "Underwater1_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE124", + "name": "Underwater_Route124_Layout", "width": 80, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater1/border.bin", - "blockdata_filepath": "data/layouts/Underwater1/map.bin" + "border_filepath": "data/layouts/Underwater_Route124/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route124/map.bin" }, { "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", @@ -4092,34 +4092,34 @@ "blockdata_filepath": "data/layouts/TerraCave_End/map.bin" }, { - "id": "LAYOUT_UNDERWATER6", - "name": "Underwater6_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE105", + "name": "Underwater_Route105_Layout", "width": 40, "height": 80, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater6/border.bin", - "blockdata_filepath": "data/layouts/Underwater6/map.bin" + "border_filepath": "data/layouts/Underwater_Route105/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route105/map.bin" }, { - "id": "LAYOUT_UNDERWATER7", - "name": "Underwater7_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE125", + "name": "Underwater_Route125_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater7/border.bin", - "blockdata_filepath": "data/layouts/Underwater7/map.bin" + "border_filepath": "data/layouts/Underwater_Route125/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route125/map.bin" }, { - "id": "LAYOUT_UNDERWATER5", - "name": "Underwater5_Layout", + "id": "LAYOUT_UNDERWATER_ROUTE129", + "name": "Underwater_Route129_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Underwater", - "border_filepath": "data/layouts/Underwater5/border.bin", - "blockdata_filepath": "data/layouts/Underwater5/map.bin" + "border_filepath": "data/layouts/Underwater_Route129/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route129/map.bin" }, { "id": "LAYOUT_MARINE_CAVE_END", diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 320bbb0d19..e4522dfca1 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "name": "AbandonedShip_CaptainsOffice", "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 13ccd41cdb..94f42d6546 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "name": "AbandonedShip_Corridors_1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index d024bb953b..c65e58ca59 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "name": "AbandonedShip_Corridors_B1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 781dfa1937..d50e015f31 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_DECK", "name": "AbandonedShip_Deck", "layout": "LAYOUT_ABANDONED_SHIP_DECK", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 22c63c0924..e0cba2d6af 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "name": "AbandonedShip_HiddenFloorCorridors", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index c41f9a7c75..b81c33c843 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "name": "AbandonedShip_HiddenFloorRooms", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index aa0800faaf..f5d14ac595 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOM_B1F", "name": "AbandonedShip_Room_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index b4f923500b..b854220965 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", "name": "AbandonedShip_Rooms2_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 16abfbdc28..5768a9a955 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "name": "AbandonedShip_Rooms2_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 9655f75cee..3fae6f96e9 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_1F", "name": "AbandonedShip_Rooms_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index eacd70a104..d69b431576 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", "name": "AbandonedShip_Rooms_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index 5b22735285..7a2f9cd156 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER1", "name": "AbandonedShip_Underwater1", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 5032eb4fcd..072ec34f44 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER2", "name": "AbandonedShip_Underwater2", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index df36f588df..f6b0acc10f 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ALTERING_CAVE", "name": "AlteringCave", "layout": "LAYOUT_ALTERING_CAVE", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index da955f23a4..06254e1f98 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -2,7 +2,7 @@ "id": "MAP_ANCIENT_TOMB", "name": "AncientTomb", "layout": "LAYOUT_ANCIENT_TOMB", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ANCIENT_TOMB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 2f440bec65..6b9145add5 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_1F", "name": "AquaHideout_1F", "layout": "LAYOUT_AQUA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 80b5c1d272..0b4cb83171 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B1F", "name": "AquaHideout_B1F", "layout": "LAYOUT_AQUA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index e33af3c9a0..d5697bfcd5 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B2F", "name": "AquaHideout_B2F", "layout": "LAYOUT_AQUA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index b641e80d1d..a2aefc63b3 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", "name": "AquaHideout_UnusedRubyMap1", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 6690e52592..50175b5d50 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", "name": "AquaHideout_UnusedRubyMap2", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index d1a9d68437..b26c4c1ae9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", "name": "AquaHideout_UnusedRubyMap3", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index f9bd9bc65a..0d315b8ee8 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ARTISAN_CAVE_1F", "name": "ArtisanCave_1F", "layout": "LAYOUT_ARTISAN_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_ARTISAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index debe5b3073..07a897bb95 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ARTISAN_CAVE_B1F", "name": "ArtisanCave_B1F", "layout": "LAYOUT_ARTISAN_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_ARTISAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index c0d8036a7c..3c9887a65f 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_2P", "name": "BattleColosseum_2P", "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 4a7e250bef..a6eddc9a87 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_4P", "name": "BattleColosseum_4P", "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index c3b4154ba8..5badc62d07 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -66,7 +66,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT @@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 arena_gettrainername @@ -83,7 +83,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT @@ -103,7 +103,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575 applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp - playse SE_W173 + playse SE_M_SNORE waitse waitmovement 0 arena_gettrainername @@ -131,7 +131,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 @@ -286,7 +286,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961 applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT @@ -294,7 +294,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961 applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT @@ -336,7 +336,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol waitmessage waitfanfare @@ -373,7 +373,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15 applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine waitmessage waitfanfare @@ -406,7 +406,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9 applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp - playse SE_BAN + playse SE_BANG waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 78665edc1d..b01d5314bb 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -67,7 +67,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61 - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitmovement 0 compare VAR_TEMP_F, DOME_FINAL @@ -95,7 +95,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82 BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7 msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT closemessage - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter @@ -120,7 +120,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw compare VAR_TEMP_2, DRAW_TUCKER call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D @@ -153,7 +153,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon compare VAR_TEMP_2, DRAW_TRAINER call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 dome_getroundtext @@ -180,7 +180,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96 msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E special DoDomeConfetti - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON @@ -361,25 +361,25 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211 applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse waitmovement 0 message BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant waitmessage - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse switch VAR_TEMP_E @@ -407,7 +407,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9 applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol waitmessage waitfanfare @@ -437,7 +437,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373 applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine waitmessage waitfanfare @@ -456,7 +456,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400 BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420 msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 5b661ce6a1..89fc022c58 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", "name": "BattleFrontier_BattleDomeCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", - "music": "MUS_B_DOME1", + "music": "MUS_B_DOME_LOBBY", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 35caadbc07..e550bbaf55 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", "name": "BattleFrontier_BattleDomeLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", - "music": "MUS_B_DOME1", + "music": "MUS_B_DOME_LOBBY", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 0d67792b95..977a0bcae2 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -224,7 +224,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT special LoadPlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index ee7a724d19..f15f6542ef 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B closemessage applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland waitmovement 0 - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol waitmessage waitfanfare @@ -179,7 +179,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09 waitmessage applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland waitmovement 0 - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 0491c925a0..48d2bcc3ad 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -62,13 +62,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @ factory_setopponentmons factory_resethelditems msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty frontier_getbrainstatus compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent - playse SE_TOREEYE + playse SE_POKENAV_CALL waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index f1ea064d64..43db81321b 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A @@ -245,7 +245,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol waitmessage waitfanfare @@ -280,7 +280,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8 applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown msgbox BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 8780bb0d39..1a5faadeab 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", "name": "BattleFrontier_BattlePikeCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 3ce985ebc9..2ca2ce4852 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", "name": "BattleFrontier_BattlePikeLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index c1d3fc9744..3e6111f427 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47 end BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49 - playse SE_CURTAIN + playse SE_PIKE_CURTAIN_CLOSE special CloseBattlePikeCurtain waitstate waitse diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json index 5d8067edc2..5a53ad19c9 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", "name": "BattleFrontier_BattlePikeRoomFinal", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json index fcaac560e4..82414ac6a3 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", "name": "BattleFrontier_BattlePikeRoomNormal", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 327b6463cc..4238dd3f37 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -83,7 +83,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285 lock faceplayer msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT @@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy waitmovement 0 - playse SE_CURTAIN + playse SE_PIKE_CURTAIN_CLOSE call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed delay 4 call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed @@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB delay 4 waitse delay 60 - playse SE_CURTAIN1 + playse SE_PIKE_CURTAIN_OPEN delay 65 call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @@ -154,7 +154,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT waitmessage - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol waitmessage waitfanfare @@ -182,7 +182,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460 goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT waitmessage - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine waitmessage waitfanfare @@ -211,14 +211,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter end BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter end @@ -230,7 +230,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E waitmovement 0 message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth waitmessage - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT @@ -573,7 +573,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json index 433bff6302..f74d548875 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", "name": "BattleFrontier_BattlePikeRoomWildMons", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index 005e285d4d..536e02a898 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", "name": "BattleFrontier_BattlePikeThreePathRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc index f590ff8900..4f378c4e57 100644 --- a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F end BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98 - playbgm MUS_PYRAMID, 0 + playbgm MUS_B_PYRAMID, 0 setvar VAR_TEMP_E, 1 end diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 98b62f580f..56736628fa 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", "name": "BattleFrontier_BattlePyramidLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", - "music": "MUS_PYRAMID", + "music": "MUS_B_PYRAMID", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 6c17ca02a9..fc33a8c911 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768 lockall message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse closemessage pyramid_set PYRAMID_DATA_WIN_STREAK, 0 @@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT frontier_givepoints @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852 lockall message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait waitmessage @@ -388,7 +388,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94 BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 7aee4512de..076fae158e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180 - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 setvar VAR_TEMP_E, 1 end @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0 waitmovement 0 message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid waitmessage - playfanfare MUS_ME_POINTGET + playfanfare MUS_OBTAIN_B_POINTS waitfanfare closemessage BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @@ -146,7 +146,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol waitmessage waitfanfare @@ -176,7 +176,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @@ -186,7 +186,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index 157c9c83fa..7cb154d8da 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", "name": "BattleFrontier_BattleTowerBattleRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index bc12c14f44..493588b4dd 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -69,7 +69,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F @@ -272,7 +272,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204 compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol waitmessage waitfanfare @@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index fad1320346..10d5ca7f71 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", "name": "BattleFrontier_BattleTowerCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index 3538a04696..f74dce2336 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR", "name": "BattleFrontier_BattleTowerElevator", "layout": "LAYOUT_BATTLE_ELEVATOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 516a900385..3135c48fe4 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", "name": "BattleFrontier_BattleTowerLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 4b1f196e3f..c1174cf066 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -81,7 +81,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 0faeed92cd..e48bcefd1b 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "name": "BattleFrontier_BattleTowerMultiBattleRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index d764419fdb..f4de372322 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -144,7 +144,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121 frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514 - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143 diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json index 3bb2a04b49..36b4ecd46e 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", "name": "BattleFrontier_BattleTowerMultiCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json index 610c99713a..c48458344f 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", "name": "BattleFrontier_BattleTowerMultiPartnerRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 77742a116f..50c6a90a9f 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER", "name": "BattleFrontier_ExchangeServiceCorner", "layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc index f0fb42bb49..b7dfe19fa0 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc @@ -42,7 +42,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5 special TakeFrontierBattlePoints adddecoration VAR_0x8009 special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1 @@ -63,7 +63,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A special TakeFrontierBattlePoints additem VAR_0x8009 special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index 2086ce78ed..a650e3ce7a 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE1", "name": "BattleFrontier_Lounge1", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 11a5498af3..856e2d395c 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE2", "name": "BattleFrontier_Lounge2", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 68d60c70ee..58aee4d419 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE3", "name": "BattleFrontier_Lounge3", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index e892ad3eab..bc85d92d0f 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -74,7 +74,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75 special TakeFrontierBattlePoints setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_FinishBet end diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 9ac2466be4..c82c51dce3 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE4", "name": "BattleFrontier_Lounge4", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index e0c2ff7478..a8650cfd61 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE5", "name": "BattleFrontier_Lounge5", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 85b9bd615d..36027a47e7 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE6", "name": "BattleFrontier_Lounge6", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index a2e795ae8c..36cf3a8829 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE7", "name": "BattleFrontier_Lounge7", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 794a83014e..0736d3b5c5 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE8", "name": "BattleFrontier_Lounge8", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 0be08a1d53..d73ad0e92a 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE9", "name": "BattleFrontier_Lounge9", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 01f3352d6c..10dc2cb1b1 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_MART", "name": "BattleFrontier_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 6995e405e4..8e891dd32c 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -108,7 +108,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA lock faceplayer waitse - playse SE_USSOKI + playse SE_SUDOWOODO_SHAKE applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 release @@ -120,7 +120,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC special DoWateringBerryTreeAnim waitstate waitse - playse SE_USSOKI + playse SE_SUDOWOODO_SHAKE applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 28a50f8af4..b4b16ba940 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", "name": "BattleFrontier_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index 98aa2be351..cb31916490 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", "name": "BattleFrontier_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index 8e179efda1..5ac9f66995 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_RANKING_HALL", "name": "BattleFrontier_RankingHall", "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index 59f7862dc8..44c71ccd1e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", "name": "BattleFrontier_ReceptionGate", "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 495ad165fa..28f53de086 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass waitfanfare waitmessage diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index a227117493..74393db0b2 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", "name": "BattleFrontier_ScottsHouse", "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5c06e6f3a8..16a1c74885 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1 setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK - playbgm MUS_RG_DEOEYE, 0 + playbgm MUS_RG_ENCOUNTER_DEOXYS, 0 waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK addobject LOCALID_DEOXYS applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 36af5ca312..17da439077 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_1F", "name": "CaveOfOrigin_1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index ea8d6cec83..db267aaaa3 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842 CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT closemessage - playse SE_KAIDAN + playse SE_EXIT fadescreenspeed FADE_TO_BLACK, 4 setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setvar VAR_SOOTOPOLIS_CITY_STATE, 3 diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 78a8e58e08..f45f47f992 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "name": "CaveOfOrigin_Entrance", "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index f27b15b855..8b05ac536e 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", "name": "CaveOfOrigin_UnusedRubySapphireMap1", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index 5a377947c6..9a3d098103 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", "name": "CaveOfOrigin_UnusedRubySapphireMap2", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 85f82b8860..9456f40129 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", "name": "CaveOfOrigin_UnusedRubySapphireMap3", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 4f8254662d..842c57968d 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL", "name": "ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index f9c3f4794d..abde00cc2f 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -32,23 +32,23 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF return ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF - savebgm MUS_TEST1 + savebgm MUS_LINK_CONTEST_P1 return ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3 - savebgm MUS_TEST2 + savebgm MUS_LINK_CONTEST_P2 return ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7 - savebgm MUS_TEST3 + savebgm MUS_LINK_CONTEST_P3 return ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB - savebgm MUS_TEST4 + savebgm MUS_LINK_CONTEST_P4 return ContestHall_EventScript_SaveContestMusic:: @ 823B7FF - savebgm MUS_CONTEST0 + savebgm MUS_CONTEST return ContestHall_OnResume: @ 823B803 diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index f0cb9168f6..c0ba03bd32 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_BEAUTY", "name": "ContestHallBeauty", "layout": "LAYOUT_CONTEST_HALL_BEAUTY", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index 4d1aa639ec..0cd6e1e2ad 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_COOL", "name": "ContestHallCool", "layout": "LAYOUT_CONTEST_HALL_COOL", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index 4b81a31925..e525390707 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_CUTE", "name": "ContestHallCute", "layout": "LAYOUT_CONTEST_HALL_CUTE", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 42d16f9114..2cbc841bd7 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_SMART", "name": "ContestHallSmart", "layout": "LAYOUT_CONTEST_HALL_SMART", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 4e460cd988..15dbb27b2a 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_TOUGH", "name": "ContestHallTough", "layout": "LAYOUT_CONTEST_HALL_TOUGH", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 7e59053b74..c87df0deee 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_RUINS", "name": "DesertRuins", "layout": "LAYOUT_DESERT_RUINS", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_DESERT_RUINS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 56d293411f..20db733818 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_UNDERPASS", "name": "DesertUnderpass", "layout": "LAYOUT_DESERT_UNDERPASS", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_DESERT_UNDERPASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 501e68523f..8beb5add70 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN", "name": "DewfordTown", "layout": "LAYOUT_DEWFORD_TOWN", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 41e7112a0e..f28550f6ea 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_GYM", "name": "DewfordTown_Gym", "layout": "LAYOUT_DEWFORD_TOWN_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 98acc97dc6..f671840454 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -80,43 +80,43 @@ DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A @ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B - playse SE_MU_PACHI + playse SE_SWITCH animateflash 6 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 5 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 4 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C - playse SE_MU_PACHI + playse SE_SWITCH animateflash 3 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 2 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 1 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D - playse SE_MU_PACHI + playse SE_SWITCH animateflash 0 call DewfordTown_Gym_EventScript_SetFlashRadius return @@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7 call DewfordTown_Gym_EventScript_GiveBulkUp closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 6612db14b4..24cde4ea17 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HALL", "name": "DewfordTown_Hall", "layout": "LAYOUT_DEWFORD_TOWN_HALL", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 7877a984f2..fd53469b90 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE1", "name": "DewfordTown_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 319bbed724..4384f37670 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE2", "name": "DewfordTown_House2", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 480bc5556c..131c930929 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "name": "DewfordTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 8de59b2a30..56add50537 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "name": "DewfordTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 5f67720e6d..9db9c8febb 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY", "name": "EverGrandeCity", "layout": "LAYOUT_EVER_GRANDE_CITY", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index ded3a305f1..34fb96e460 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "name": "EverGrandeCity_ChampionsRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 5ef3a946ee..d41c10d0a0 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42 step_end EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45 - playbgm MUS_DAIGO, 0 + playbgm MUS_ENCOUNTER_CHAMPION, 0 msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat goto EverGrandeCity_ChampionsRoom_EventScript_Defeated @@ -71,11 +71,11 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61 end EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC - playbgm MUS_GIRL_SUP, 0 + playbgm MUS_ENCOUNTER_MAY, 0 return EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1 - playbgm MUS_BOY_SUP, 0 + playbgm MUS_ENCOUNTER_BRENDAN, 0 return EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6 diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 9b54a5e5b4..b7bcd49665 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "name": "EverGrandeCity_DrakesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index b9debf676d..feb65d149a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat goto EverGrandeCity_DrakesRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 21c50192bd..86a840d13a 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "name": "EverGrandeCity_GlaciasRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 6e6254faa9..ff04a752ab 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat goto EverGrandeCity_GlaciasRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 692e7ff7ca..426b9f6e45 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL1", "name": "EverGrandeCity_Hall1", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index ea1203725c..3535734e95 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL2", "name": "EverGrandeCity_Hall2", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index 327b28399b..b7fe8f4ecd 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL3", "name": "EverGrandeCity_Hall3", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index ff91999e01..b0501cd38b 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL4", "name": "EverGrandeCity_Hall4", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 562e11565b..1f6705f3a4 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL5", "name": "EverGrandeCity_Hall5", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index 04b68237d1..e09190eb96 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "name": "EverGrandeCity_HallOfFame", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", - "music": "MUS_EIKOU_R", + "music": "MUS_HALL_OF_FAME_ROOM", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 5716b3ef1b..09c6dd40e2 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "name": "EverGrandeCity_PhoebesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 891b3c56ea..e98bf4eb36 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat goto EverGrandeCity_PhoebesRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 85a2c677bb..196ebd0f24 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "name": "EverGrandeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 3b6d94249f..a6cf1b74e5 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -45,7 +45,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE - playse SE_KAIDAN + playse SE_EXIT waitse removeobject LOCALID_SCOTT release diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 7dfa712a6a..b734f9ad56 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "name": "EverGrandeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 6b0c0be80b..f76febc010 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "name": "EverGrandeCity_PokemonLeague_1F", "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index cf824b8e88..5eed4faa69 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -68,7 +68,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636 applymovement LOCALID_GUARD_2, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay waitmovement 0 delay 10 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE message EverGrandeCity_PokemonLeague_1F_Text_GoForth waitmessage waitfanfare @@ -90,7 +90,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A return EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE - playse SE_HAZURE + playse SE_FAILURE msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 8289458b0b..a4b5cb1f2b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", "name": "EverGrandeCity_PokemonLeague_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 39cdea6cea..dc84d36d6d 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "name": "EverGrandeCity_SidneysRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9bc9757896..717651b262 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_SidneysRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat goto EverGrandeCity_SidneysRoom_EventScript_Defeated diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 54809f977e..74355a870f 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN", "name": "FallarborTown", "layout": "LAYOUT_FALLARBOR_TOWN", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index adf6dfd943..7b702dc0e5 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM", "name": "FallarborTown_BattleTentBattleRoom", "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index feb8f49e10..fd1f278608 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -52,7 +52,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F applymovement LOCALID_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter waitmovement 0 applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT @@ -63,7 +63,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F switch VAR_RESULT case 1, FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_W173 + playse SE_M_SNORE waitse waitmovement 0 fallarbortent_getopponentname @@ -76,7 +76,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_BAN + playse SE_BANG waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT @@ -98,7 +98,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 3bda444842..c086a32880 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR", "name": "FallarborTown_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 58a1463e9b..a796a3f105 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", "name": "FallarborTown_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 54248e4021..0a6a4f16cd 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -55,7 +55,7 @@ FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message FallarborTown_BattleTentLobby_Text_ReceivedPrize waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT closemessage diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index a1ed478853..a7ae1f90df 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", "name": "FallarborTown_CozmosHouse", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 29040bcd77..77c5df9762 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MART", "name": "FallarborTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index 220b6cb8ee..ce3f3a3dde 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", "name": "FallarborTown_MoveRelearnersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 5f85478dcc..cb06908290 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", "name": "FallarborTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c65cf5d4ea..e7967046db 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -50,7 +50,7 @@ FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38 end FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48 - playse SE_JIDO_DOA + playse SE_SLIDING_DOOR removeobject LOCALID_LANETTE clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE release diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 202485ea09..ada498a426 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", "name": "FallarborTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 6898f5b244..d3c6056a0a 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FARAWAY_ISLAND_ENTRANCE", "name": "FarawayIsland_Entrance", "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_FARAWAY_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 4f427e8a49..1ec092fbe7 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_FARAWAY_ISLAND_INTERIOR", "name": "FarawayIsland_Interior", "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_FARAWAY_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 424596c0c2..ef11990d85 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIERY_PATH", "name": "FieryPath", "layout": "LAYOUT_FIERY_PATH", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_FIERY_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 062d0808a3..86d43693ac 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY", "name": "FortreeCity", "layout": "LAYOUT_FORTREE_CITY", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index f5af152af1..59b707a953 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_DECORATION_SHOP", "name": "FortreeCity_DecorationShop", "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index fcaf1a036e..0db326d07e 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_GYM", "name": "FortreeCity_Gym", "layout": "LAYOUT_FORTREE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index f209ceefa8..688c116459 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD call FortreeCity_Gym_EventScript_GiveAerialAce closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index ae35cf6016..cef2030931 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE1", "name": "FortreeCity_House1", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index dcd8f30cd0..fed6a9f65a 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE2", "name": "FortreeCity_House2", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index e96be4174c..f7c47ede12 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE3", "name": "FortreeCity_House3", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 6996600568..a01772eeaf 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE4", "name": "FortreeCity_House4", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 32fcefe2ba..b1577e6486 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE5", "name": "FortreeCity_House5", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index a52ece8b21..61ab4cefd4 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_MART", "name": "FortreeCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 16c5fe8b67..d593490333 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", "name": "FortreeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index fdd9ee79df..1859bf131c 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", "name": "FortreeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index a4c2bf0ff0..ff60d726b7 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_1F", "name": "GraniteCave_1F", "layout": "LAYOUT_GRANITE_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 103220612e..be2f5ae013 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B1F", "name": "GraniteCave_B1F", "layout": "LAYOUT_GRANITE_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index c3f6fbf9a3..bf58a40e3a 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B2F", "name": "GraniteCave_B2F", "layout": "LAYOUT_GRANITE_CAVE_B2F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 934a8320e6..0705303782 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", "name": "GraniteCave_StevensRoom", "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 7d0b275a59..650177b955 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -17,7 +17,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT waitfanfare closemessage @@ -33,7 +33,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast compare VAR_FACING, DIR_EAST call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_STEVEN release end diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 0cb71092d7..7c540411f5 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ISLAND_CAVE", "name": "IslandCave", "layout": "LAYOUT_ISLAND_CAVE", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ISLAND_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 8587e62c21..56643a5040 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -46,7 +46,7 @@ IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0 setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index eeac79e15e..d7e7d5e2e3 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -2,7 +2,7 @@ "id": "MAP_JAGGED_PASS", "name": "JaggedPass", "layout": "LAYOUT_JAGGED_PASS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_JAGGED_PASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index eacc7835e3..c7fc95676a 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -58,7 +58,7 @@ JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB setvar VAR_0x8007, 3 @ shake delay special ShakeCamera waitstate - playse SE_KOUKA_M + playse SE_EFFECTIVE setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1 setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0 special DrawWholeMapView diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 1ab9f60cff..54bda6ca32 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN", "name": "LavaridgeTown", "layout": "LAYOUT_LAVARIDGE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 47c5482a6a..1f9fe421d6 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -105,11 +105,11 @@ LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF end LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A @@ -258,7 +258,7 @@ LavaridgeTown_EventScript_EggWoman:: @ 81EA744 goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LavaridgeTown_Text_ReceivedTheEgg waitfanfare giveegg SPECIES_WYNAUT diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 49b4ef2fd1..2f624a2f91 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_1F", "name": "LavaridgeTown_Gym_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 3747d854d7..df95a0b4b8 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -76,7 +76,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 call LavaridgeTown_Gym_1F_EventScript_GiveOverheat closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 0b1e81445a..bbcdbcbe18 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", "name": "LavaridgeTown_Gym_B1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index e76a98f645..6be35b7292 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", "name": "LavaridgeTown_HerbShop", "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 5827399bdf..2a8d5362cf 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HOUSE", "name": "LavaridgeTown_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 8099a5463c..5c871785d1 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_MART", "name": "LavaridgeTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 1542b7b50f..42cf11aede 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", "name": "LavaridgeTown_PokemonCenter_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index eb68b0bb51..72a5f688b1 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", "name": "LavaridgeTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 8d35fc0c6b..a13904ca9a 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY", "name": "LilycoveCity", "layout": "LAYOUT_LILYCOVE_CITY", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index b8f0cd5661..0c94bce626 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -241,7 +241,7 @@ LilycoveCity_EventScript_Rival:: @ 81E2DDE end LilycoveCity_EventScript_May:: @ 81E2DF8 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle compare VAR_RESULT, NO @@ -270,7 +270,7 @@ LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A end LilycoveCity_EventScript_Brendan:: @ 81E2E6B - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle compare VAR_RESULT, NO diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index bddb6d7c1d..e8151c832f 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", "name": "LilycoveCity_ContestHall", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index eb7ebf9077..ac5346dc4f 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", "name": "LilycoveCity_ContestLobby", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 6b71c5125b..51c38e3f4e 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -99,7 +99,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314 applymovement LOCALID_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT @@ -272,7 +272,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4 applymovement LOCALID_ARTIST_LINK, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT @@ -417,13 +417,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670 lockall applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_WallShadow, 1 setmetatile 12, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView @@ -938,13 +938,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49 closemessage applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_WallShadow, 1 setmetatile 17, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index ba65638772..4b18e22c18 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", "name": "LilycoveCity_CoveLilyMotel_1F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index ff84a3bf7b..f55770b88c 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", "name": "LilycoveCity_CoveLilyMotel_2F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 7878e791a9..9d3520be56 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9 LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702 setflag FLAG_TEMP_2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 989cf65efb..9a3c43308f 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "LilycoveCity_DepartmentStoreElevator", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 856c06bd40..deb7ad0446 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", "name": "LilycoveCity_DepartmentStoreRooftop", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 12cb4727c3..8d7459b3c3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -145,7 +145,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0 bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -157,7 +157,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -169,7 +169,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 9efcdb13a3..758e063f6d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", "name": "LilycoveCity_DepartmentStore_1F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 7a1e8bf04d..ebef46ae58 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", "name": "LilycoveCity_DepartmentStore_2F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index e95c8173f0..c911b9d265 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", "name": "LilycoveCity_DepartmentStore_3F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index d57963ac75..c6291ec2c7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", "name": "LilycoveCity_DepartmentStore_4F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index d92404b983..6123c1c78b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", "name": "LilycoveCity_DepartmentStore_5F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index b5238ac206..491d426243 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HARBOR", "name": "LilycoveCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 85ea994c5e..bd6850f5a7 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE1", "name": "LilycoveCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 719a63067b..5c208c852b 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE2", "name": "LilycoveCity_House2", "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 3b4212c1a3..0331372c9a 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE3", "name": "LilycoveCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index e086b2d455..7a1571abf7 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE4", "name": "LilycoveCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 8e56058215..09875fddcc 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", "name": "LilycoveCity_LilycoveMuseum_1F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 7c3c144c83..76d30eb68b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", "name": "LilycoveCity_LilycoveMuseum_2F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index caed79705d..814719a9cf 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", "name": "LilycoveCity_MoveDeletersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 6e7f9c580d..1a27e3b8f1 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -45,7 +45,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0 compare VAR_RESULT, TRUE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf special MoveDeleterForgetMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 625904e41e..daaec11913 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", "name": "LilycoveCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index a82cc515a2..b9c8e1302c 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", "name": "LilycoveCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 820bf34c4a..7d5c42034e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "LilycoveCity_PokemonTrainerFanClub", "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 65c9b2295c..696674bf13 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_UNUSED_MART", "name": "LilycoveCity_UnusedMart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index f0c5694d8c..5335dd66eb 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN", "name": "LittlerootTown", "layout": "LAYOUT_LITTLEROOT_TOWN", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 347a805e80..ba58323096 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -147,7 +147,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 - playse SE_DANSA + playse SE_LEDGE applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 @@ -950,7 +950,7 @@ LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686 LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693 msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_Text_SwitchShoesWithRunningShoes waitfanfare setflag FLAG_RECEIVED_RUNNING_SHOES diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 9911e293a9..3929b2e0cf 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", "name": "LittlerootTown_BrendansHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 65ff3ab98a..ee677fbff8 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -147,7 +147,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6 end LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_RIVAL delay 30 @@ -158,7 +158,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0 compare VAR_0x8008, 1 @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1 compare VAR_0x8008, 2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 9cfdec8fed..03e2dcd829 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", "name": "LittlerootTown_BrendansHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 7af4580c37..ab6f55af5d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -74,7 +74,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 10 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 compare VAR_FACING, DIR_NORTH call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 5e3a5aecd1..7396651813 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", "name": "LittlerootTown_MaysHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 958951dc99..1e1bb0e119 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -181,7 +181,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F end LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_RIVAL delay 30 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 compare VAR_0x8008, 0 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0 compare VAR_0x8008, 1 @@ -207,7 +207,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1 compare VAR_0x8008, 2 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 54b4e7c7e8..1fa2ff01d9 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", "name": "LittlerootTown_MaysHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 7c943e0e28..dd22ed670b 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -74,7 +74,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 10 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 compare VAR_FACING, DIR_NORTH call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 629516c256..deee3e2643 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", "name": "LittlerootTown_ProfessorBirchsLab", "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", - "music": "MUS_ODAMAKI", + "music": "MUS_BIRCH_LAB", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 7886bda187..bc03be7b2f 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -120,7 +120,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO compare VAR_RESULT, YES @@ -183,13 +183,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement LOCALID_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes waitmovement 0 delay 20 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 20 applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft @@ -208,7 +208,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational waitmessage waitfanfare @@ -492,7 +492,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F end LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter waitmessage waitfanfare @@ -536,7 +536,7 @@ EventScript_RegisterProfBirch:: @ 81FA2D2 msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT waitfanfare closemessage @@ -587,7 +587,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F return LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare setflag FLAG_SYS_POKEDEX_GET diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 8865cff2f9..fe5513e3f8 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_1F", "name": "MagmaHideout_1F", "layout": "LAYOUT_MAGMA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index 1d7d2958d9..a5c52683cb 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_1R", "name": "MagmaHideout_2F_1R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 38f492421c..4aa6896f6e 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_2R", "name": "MagmaHideout_2F_2R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index fbed237819..51a4daf263 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_3R", "name": "MagmaHideout_2F_3R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index 082b1d4c6f..edf4cfa218 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_1R", "name": "MagmaHideout_3F_1R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 3bf22b2e08..70c6bfb973 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_2R", "name": "MagmaHideout_3F_2R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 38a5342c39..824f5cb746 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_3R", "name": "MagmaHideout_3F_3R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 0dec87a139..d38e85fdf8 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_4F", "name": "MagmaHideout_4F", "layout": "LAYOUT_MAGMA_HIDEOUT_4F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ffca9c75ff..50382f44e3 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -11,17 +11,17 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_Maxie:: @ 823A560 lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 - playse SE_W197 + playse SE_M_DETECT dofieldeffectsparkle 18, 42, 0 waitfieldeffect FLDEFF_SPARKLE setvar VAR_RESULT, 1 - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special DoOrbEffect applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 7f382b0880..d2e506a147 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -2,7 +2,7 @@ "id": "MAP_MARINE_CAVE_END", "name": "MarineCave_End", "layout": "LAYOUT_MARINE_CAVE_END", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 541ccddc6c..f815ca0699 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_MARINE_CAVE_ENTRANCE", "name": "MarineCave_Entrance", "layout": "LAYOUT_MARINE_CAVE_ENTRANCE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 096edafe3e..cf3d5f8a1c 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY", "name": "MauvilleCity", "layout": "LAYOUT_MAUVILLE_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 701c36159b..7107f4754a 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -460,7 +460,7 @@ MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA pokenavcall MauvilleCity_Text_WallyPokenavCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 44d09d8836..217d3be26e 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", "name": "MauvilleCity_BikeShop", "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 1493cda23e..2564596bab 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GAME_CORNER", "name": "MauvilleCity_GameCorner", "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", - "music": "MUS_CASINO", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 46c61a017b..ad3f7a407f 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 removemoney COINS_PRICE_50, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox hidecoinsbox 0, 5 @@ -71,7 +71,7 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 removemoney COINS_PRICE_500, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox hidecoinsbox 0, 5 @@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB removecoins DOLL_COINS adddecoration DECOR_TREECKO_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05 removecoins DOLL_COINS adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -204,7 +204,7 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F removecoins DOLL_COINS adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD removecoins TM32_COINS additem ITEM_TM32 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017 removecoins TM29_COINS additem ITEM_TM29 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051 removecoins TM35_COINS additem ITEM_TM35 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B removecoins TM24_COINS additem ITEM_TM24 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -372,7 +372,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5 removecoins TM13_COINS additem ITEM_TM13 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -481,7 +481,7 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D setflag FLAG_RECEIVED_20_COINS addcoins 20 msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT - playse SE_REGI + playse SE_SHOP goto MauvilleCity_GameCorner_EventScript_PokefanMNormal end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 50122e216a..2451c6cd67 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GYM", "name": "MauvilleCity_Gym", "layout": "LAYOUT_MAUVILLE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index edf0a31291..3fa7dc8c94 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -101,11 +101,11 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B call Common_EventScript_SetGymTrainers special MauvilleGymDeactivatePuzzle special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK call MauvilleCity_Gym_EventScript_GiveShockWave closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MauvilleCity_Gym_Text_RegisteredWattson, MSGBOX_DEFAULT waitfanfare closemessage @@ -185,7 +185,7 @@ MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D special MauvilleGymSetDefaultBarriers special MauvilleGymPressSwitch special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState releaseall diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 4f203bce67..019ae6f09a 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE1", "name": "MauvilleCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 5c092f1c76..009befbab8 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE2", "name": "MauvilleCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 2dcdd906e1..ee4091ee1a 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_MART", "name": "MauvilleCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 50e5d3c9f8..9feb04be9d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", "name": "MauvilleCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index da8f19255f..3f616938b7 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", "name": "MauvilleCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 45cf5803eb..f177410e27 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_1R", "name": "MeteorFalls_1F_1R", "layout": "LAYOUT_METEOR_FALLS_1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 56deaa353f..c942e230ec 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 @@ -50,7 +50,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F addobject LOCALID_ARCHIE addobject LOCALID_AQUA_GRUNT_1 addobject LOCALID_AQUA_GRUNT_2 - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index ea585829f7..49e001c886 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_2R", "name": "MeteorFalls_1F_2R", "layout": "LAYOUT_METEOR_FALLS_1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 2db212dfaa..6cba2ec487 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_1R", "name": "MeteorFalls_B1F_1R", "layout": "LAYOUT_METEOR_FALLS_B1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index e318acfbc0..57276d86db 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_2R", "name": "MeteorFalls_B1F_2R", "layout": "LAYOUT_METEOR_FALLS_B1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index 7b1f7439e8..01b05d3081 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_STEVENS_CAVE", "name": "MeteorFalls_StevensCave", "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 91e15cc39c..bb79300067 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_1F", "name": "MirageTower_1F", "layout": "LAYOUT_MIRAGE_TOWER_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index 5e9769db6c..bf45616753 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_2F", "name": "MirageTower_2F", "layout": "LAYOUT_MIRAGE_TOWER_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index 2692de62a9..6ccbf46784 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_3F", "name": "MirageTower_3F", "layout": "LAYOUT_MIRAGE_TOWER_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 03ecc06479..a153fbb2ac 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_4F", "name": "MirageTower_4F", "layout": "LAYOUT_MIRAGE_TOWER_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index d360959a12..ff8ae1b616 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY", "name": "MossdeepCity", "layout": "LAYOUT_MOSSDEEP_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 6188b4f37a..14b89fe424 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", "name": "MossdeepCity_GameCorner_1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 7ea92448c0..180bd703a4 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", "name": "MossdeepCity_GameCorner_B1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index fa40995659..9b63a0c081 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GYM", "name": "MossdeepCity_Gym", "layout": "LAYOUT_MOSSDEEP_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index d8bff6dd1e..0e6487e16a 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -81,7 +81,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 call MossdeepCity_Gym_EventScript_GiveCalmMind closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT waitfanfare closemessage @@ -126,7 +126,7 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999 MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK releaseall end @@ -308,9 +308,9 @@ MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D end MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 0 waitmovement 0 @@ -320,9 +320,9 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 end MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 1 waitmovement 0 @@ -332,9 +332,9 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D end MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 2 waitmovement 0 @@ -344,9 +344,9 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 end MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 3 waitmovement 0 @@ -356,9 +356,9 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 end MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 4 waitmovement 0 diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f57f4df18b..f4338078e4 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE1", "name": "MossdeepCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 9a9a081731..e7990bad99 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE2", "name": "MossdeepCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index c6cfaf0979..a0587ca0ab 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE3", "name": "MossdeepCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index b4b77372d9..0c7e0a1122 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE4", "name": "MossdeepCity_House4", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 83218e7e1e..37885b7524 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_MART", "name": "MossdeepCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 7516324625..ac3b51e8f9 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", "name": "MossdeepCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 9206cf844c..7fa6566979 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", "name": "MossdeepCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 32b5ff4897..0f50696657 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", "name": "MossdeepCity_SpaceCenter_1F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 7e01d7f1a7..8990aa0759 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", "name": "MossdeepCity_SpaceCenter_2F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 6c9d4a9056..62550d7c63 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -204,7 +204,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT closemessage delay 30 - playse SE_KOUKA_L + playse SE_NOT_EFFECTIVE switch VAR_FACING case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth applymovement LOCALID_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFight diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 81eefbd94f..cad7609d31 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", "name": "MossdeepCity_StevensHouse", "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 0017f553d2..1d384efe1f 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -123,7 +123,7 @@ MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0 MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB bufferspeciesname 1, SPECIES_BELDUM removeobject LOCALID_BELDUM_BALL - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message MossdeepCity_StevensHouse_Text_ObtainedBeldum waitmessage waitfanfare diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 7e95b291c8..7083ff7de1 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY", "name": "MtChimney", "layout": "LAYOUT_MT_CHIMNEY", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_VOLCANIC_ASH", diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 42ebce0f9e..c633d93135 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -40,7 +40,7 @@ MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02 MtChimney_EventScript_Maxie:: @ 822EE0B lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT applymovement LOCALID_MAXIE, Common_Movement_FacePlayer waitmovement 0 diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 3926f24447..410bc0c2e6 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", "name": "MtChimney_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6ce84933f4..5eebdb7673 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C applymovement LOCALID_ATTENDANT, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE @ Going down setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 153a14a927..248bd65304 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_1F", "name": "MtPyre_1F", "layout": "LAYOUT_MT_PYRE_1F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 69e7b1e187..0668bcf788 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_2F", "name": "MtPyre_2F", "layout": "LAYOUT_MT_PYRE_2F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 08c5945143..35c6c1b04b 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_3F", "name": "MtPyre_3F", "layout": "LAYOUT_MT_PYRE_3F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index f9658c6cf9..d326bff72b 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_4F", "name": "MtPyre_4F", "layout": "LAYOUT_MT_PYRE_4F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 93cc0013e2..fb7c3f2f84 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_5F", "name": "MtPyre_5F", "layout": "LAYOUT_MT_PYRE_5F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 1291d6356d..dc2e7f9b00 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_6F", "name": "MtPyre_6F", "layout": "LAYOUT_MT_PYRE_6F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 67a0dac6ec..58c865305f 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_EXTERIOR", "name": "MtPyre_Exterior", "layout": "LAYOUT_MT_PYRE_EXTERIOR", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 87a1ad9776..aa3341f8ac 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 9daf02f5bf..c2692ff20d 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -39,7 +39,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 end MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index f7d969e21b..8e366fc165 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_B1F", "name": "NavelRock_B1F", "layout": "LAYOUT_NAVEL_ROCK_B1F", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 1db5649bc3..13d6762006 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BOTTOM", "name": "NavelRock_Bottom", "layout": "LAYOUT_NAVEL_ROCK_BOTTOM", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index f0c73b1f82..9c438fc5cf 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -35,14 +35,14 @@ NavelRock_Bottom_EventScript_Lugia:: @ 82692A2 faceplayer waitse delay 20 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ vertical pan setvar VAR_0x8005, 3 @ horizontal pan setvar VAR_0x8006, 4 @ num shakes setvar VAR_0x8007, 2 @ shake delay special ShakeCamera delay 30 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ vertical pan setvar VAR_0x8005, 3 @ horizontal pan setvar VAR_0x8006, 4 @ num shakes diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 1c47e450ea..6749969204 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN01", "name": "NavelRock_Down01", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index aaae333c3c..7c75a1b036 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN02", "name": "NavelRock_Down02", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index 60acdc6681..936ebab778 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN03", "name": "NavelRock_Down03", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index edfc400e70..585ee75380 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN04", "name": "NavelRock_Down04", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index f4d31fdff0..1099d9caab 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN05", "name": "NavelRock_Down05", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index ef20800f3a..7fb26f293a 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN06", "name": "NavelRock_Down06", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index 0019d726f2..36896f3068 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN07", "name": "NavelRock_Down07", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index 17d50c0ede..f9945f49f8 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN08", "name": "NavelRock_Down08", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 49713ffc3f..38b2fdae82 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN09", "name": "NavelRock_Down09", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index d736db5d9d..7ea3bfa3bf 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN10", "name": "NavelRock_Down10", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index ac45da8a20..da05c7e6b6 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN11", "name": "NavelRock_Down11", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index 66d462f5fd..ab14b2da12 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_ENTRANCE", "name": "NavelRock_Entrance", "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 8527705c16..13927b6b6f 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_EXTERIOR", "name": "NavelRock_Exterior", "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", - "music": "MUS_RG_NANASHIMA", + "music": "MUS_RG_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index a5301bd6b5..a8929208f2 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_FORK", "name": "NavelRock_Fork", "layout": "LAYOUT_NAVEL_ROCK_FORK", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 62308d149f..34e1391086 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_HARBOR", "name": "NavelRock_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_RG_NANASHIMA", + "music": "MUS_RG_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 8669e746fb..c062027264 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_TOP", "name": "NavelRock_Top", "layout": "LAYOUT_NAVEL_ROCK_TOP", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index 01dfcaffa9..ee744ff4bc 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP1", "name": "NavelRock_Up1", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index 0233edb782..aa24703294 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP2", "name": "NavelRock_Up2", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index c12438fc94..2629eafb1e 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP3", "name": "NavelRock_Up3", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index 4cdcba842c..4060a52a7d 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP4", "name": "NavelRock_Up4", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 71650200ba..d66c5b13b2 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_ENTRANCE", "name": "NewMauville_Entrance", "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 6d7d731de4..d398a03ead 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_Door:: @ 82372FF setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0 setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 16127d6994..eea1190685 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_INSIDE", "name": "NewMauville_Inside", "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index b16fb4044a..ee6101ff6c 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN", "name": "OldaleTown", "layout": "LAYOUT_OLDALE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index aeb0c3dbd4..f99c65d2c0 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion setflag FLAG_TEMP_1 - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT closemessage switch VAR_FACING diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 9702949262..cd64357dc8 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE1", "name": "OldaleTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 52c775f15b..2347fc29aa 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE2", "name": "OldaleTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index cba6b012c1..6922235418 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_MART", "name": "OldaleTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 1c979098e3..46ee3f9bd1 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", "name": "OldaleTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index de1b0a7715..fdeb28c069 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", "name": "OldaleTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index fdf43d1ace..51fc772a92 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN", "name": "PacifidlogTown", "layout": "LAYOUT_PACIFIDLOG_TOWN", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index b6db1c9237..a494819a5d 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", "name": "PacifidlogTown_House1", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index ceeadd9a63..027442b4ba 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", "name": "PacifidlogTown_House2", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 34d9ddad27..17f99cea13 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", "name": "PacifidlogTown_House3", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index cd8dfc52ff..4c4cdb15b1 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", "name": "PacifidlogTown_House4", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index e1d6f42892..ac93845024 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", "name": "PacifidlogTown_House5", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 20d00fecbb..50baa2b7c1 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", "name": "PacifidlogTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 97b48ef2e6..1837ab55cb 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", "name": "PacifidlogTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index faec3eea1f..d9587cdbb9 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY", "name": "PetalburgCity", "layout": "LAYOUT_PETALBURG_CITY", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 558eac64e8..ab77e18e0b 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -27,7 +27,7 @@ PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307 PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F setflag FLAG_HIDE_MAP_NAME_POPUP - savebgm MUS_TSURETEK + savebgm MUS_FOLLOW_ME return PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316 @@ -271,7 +271,7 @@ PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer waitmovement 0 - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 playse SE_PIN applymovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index f38463a19c..307708fc19 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_GYM", "name": "PetalburgCity_Gym", "layout": "LAYOUT_PETALBURG_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index c8e14a13fd..2bdd5320fb 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 @@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth compare VAR_0x8008, 1 @@ -487,7 +487,7 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13 msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth compare VAR_0x8008, 2 diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 46121f67c6..54bd3303f0 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE1", "name": "PetalburgCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 8f40ec3e4e..4a5436b97c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE2", "name": "PetalburgCity_House2", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index a263e30366..a55e27293c 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_MART", "name": "PetalburgCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index 29ba086f27..1fd6e972b9 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", "name": "PetalburgCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 2fd4bf21a1..8eb89d2083 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", "name": "PetalburgCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c0efbeb67a..0b8007a918 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", "name": "PetalburgCity_WallysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index cc9004737f..fa97b5dd16 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS", "name": "PetalburgWoods", "layout": "LAYOUT_PETALBURG_WOODS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 292c2dfacf..dbdb66b0b8 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -11,7 +11,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index f3466eea81..083f444452 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CORNER", "name": "RecordCorner", "layout": "LAYOUT_RECORD_CORNER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index e08c4fe5a1..34dc92841c 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE101", "name": "Route101", "layout": "LAYOUT_ROUTE101", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_101", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 647c9ee16b..66ce4abc8f 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -21,7 +21,7 @@ Route101_EventScript_HideMapNamePopup:: @ 81EBCD5 Route101_EventScript_StartBirchRescue:: @ 81EBCDE lockall - playbgm MUS_EVENT0, 1 + playbgm MUS_HELP, 1 msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT closemessage setobjectxy LOCALID_BIRCH, 0, 15 diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 43e327d015..fc9adee3bf 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE102", "name": "Route102", "layout": "LAYOUT_ROUTE102", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_102", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 599d0447f1..4b91f913b8 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE103", "name": "Route103", "layout": "LAYOUT_ROUTE103", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_103", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index df8c3b628e..965b5ff5cd 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -31,7 +31,7 @@ Route103_EventScript_Rival:: @ 81EC3C1 Route103_EventScript_RivalMay:: @ 81EC3DA msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT closemessage - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 applymovement LOCALID_RIVAL, Common_Movement_FacePlayer waitmovement 0 applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark @@ -48,7 +48,7 @@ Route103_EventScript_RivalMay:: @ 81EC3DA Route103_EventScript_RivalBrendan:: @ 81EC434 msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT closemessage - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 applymovement LOCALID_RIVAL, Common_Movement_FacePlayer waitmovement 0 applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark @@ -115,7 +115,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_EventScript_RivalExitFacingNorth2 waitmovement 0 goto Route103_EventScript_RivalEnd @@ -125,7 +125,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2 waitmovement 0 goto Route103_EventScript_RivalEnd @@ -134,7 +134,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 Route103_EventScript_RivalExitFacingSouth:: @ 81EC585 applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2 waitmovement 0 goto Route103_EventScript_RivalEnd diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 99b8ffeb39..69e5faf27b 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104", "name": "Route104", "layout": "LAYOUT_ROUTE104", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index ff90038871..d1faca53a7 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -84,11 +84,11 @@ Route104_EventScript_PlayRivalMusic:: @ 81ECD11 return Route104_EventScript_PlayMayMusic:: @ 81ECD29 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route104_EventScript_RivalEncounter:: @ 81ECD33 @@ -106,7 +106,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage @@ -195,7 +195,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage @@ -387,7 +387,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF pokenavcall Route104_Text_DadPokenavCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index e027c520e9..ae4ffc7911 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", "name": "Route104_MrBrineysHouse", "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 511f1cf7c0..ec18b1ded9 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index d1210f4f19..a15458bf67 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE", "name": "Route104_Prototype", "layout": "LAYOUT_ROUTE104_PROTOTYPE", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index e65913f304..7abd76e3d4 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrototypePrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 76f11b3bd9..bd951f62c7 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE105", "name": "Route105", "layout": "LAYOUT_ROUTE105", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_105", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER6" + "map": "MAP_UNDERWATER_ROUTE105" } ], "object_events": [ diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 3076088122..c28d593a7f 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE106", "name": "Route106", "layout": "LAYOUT_ROUTE106", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_106", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 3768551a34..ddc0f14598 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE107", "name": "Route107", "layout": "LAYOUT_ROUTE107", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_107", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 36b2009647..21acfd6cae 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE108", "name": "Route108", "layout": "LAYOUT_ROUTE108", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_108", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index f6b1a46cd8..2ddcc4530b 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109", "name": "Route109", "layout": "LAYOUT_ROUTE109", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 6a86e8c246..0a8164ba7c 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109_SEASHORE_HOUSE", "name": "Route109_SeashoreHouse", "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 5e15be18c3..bb5df5eb4a 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110", "name": "Route110", "layout": "LAYOUT_ROUTE110", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7cdb547edb..50f3d1f48c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -410,11 +410,11 @@ Route110_EventScript_RivalScene:: @ 81EF76E end Route110_EventScript_PlayMayMusic:: @ 81EF7E1 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route110_EventScript_MayBattle:: @ 81EF7EB @@ -648,7 +648,7 @@ Route110_EventScript_BirchScene:: @ 81EF9F7 msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index cd9fd8060b..0d382f2754 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadNorthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 01c200b02d..12cd26adae 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadSouthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index fb9c25c08b..5d6ddb5561 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", "name": "Route110_TrickHouseCorridor", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 6f6f3fcc78..c82d871fbd 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_END", "name": "Route110_TrickHouseEnd", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 7e6f6a5bfd..0852b4e334 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -194,7 +194,7 @@ Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7 Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -242,7 +242,7 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 delay 20 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 499cf26e08..5895ae7884 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", "name": "Route110_TrickHouseEntrance", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 98b06a94f2..adfcf6bbc4 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8 delay 20 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -480,7 +480,7 @@ Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A waitmovement 0 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -711,7 +711,7 @@ Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB end Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route110_TrickHousePuzzle_Text_FoundAScroll waitfanfare msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 087057163d..42a416b51f 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", "name": "Route110_TrickHousePuzzle1", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index f2c96756be..2b3ca9b2e3 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", "name": "Route110_TrickHousePuzzle2", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 389391b87b..ba01c6b334 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", "name": "Route110_TrickHousePuzzle3", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index ad00f12ac0..8e8348c953 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", "name": "Route110_TrickHousePuzzle4", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index ee074b37d1..9eba5d7f84 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", "name": "Route110_TrickHousePuzzle5", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 419fa28316..36162f42f7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -454,7 +454,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152 waitse - playse SE_HAZURE + playse SE_FAILURE msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_MechadollShake applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_MechadollShake @@ -472,7 +472,7 @@ Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152 Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0 waitse - playse SE_SEIKAI + playse SE_SUCCESS goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index bec9d12b3a..ff6e3e7f31 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", "name": "Route110_TrickHousePuzzle6", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 12afd07ec5..f5976bdefa 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", "name": "Route110_TrickHousePuzzle7", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 6b75593893..b0cbd38139 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -125,7 +125,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off end @@ -136,7 +136,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off end @@ -147,7 +147,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off end @@ -158,7 +158,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off end @@ -169,7 +169,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off end @@ -227,9 +227,9 @@ Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316 @ From here is where the new, actually used puzzle scripts begin Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 0 waitmovement 0 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B end Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 1 waitmovement 0 @@ -251,9 +251,9 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331 end Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 2 waitmovement 0 @@ -263,9 +263,9 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347 end Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 3 waitmovement 0 @@ -276,9 +276,9 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D @ Unused Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 4 waitmovement 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 3a1bc8caf5..bfb106eb66 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", "name": "Route110_TrickHousePuzzle8", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 938dbcff10..014ac084cc 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 281dddf0c6..322c9a2b72 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -126,7 +126,7 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 special StartMirageTowerShake waitstate delay 24 - playse SE_RU_HYUU + playse SE_FALL addobject LOCALID_PLAYER_FALLING special StartPlayerDescendMirageTower waitstate @@ -268,14 +268,14 @@ Route111_Movement_PushRightFromRoute: @ 81F0FAE Route111_EventScript_SunTrigger:: @ 81F0FB0 setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_SandstormTrigger:: @ 81F0FBD setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 679b535221..419e4c2ee0 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", "name": "Route111_OldLadysRestStop", "layout": "LAYOUT_HOUSE3", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index ec5afd93aa..f889359712 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", "name": "Route111_WinstrateFamilysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 37f0a38dfa..d4d650857f 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112", "name": "Route112", "layout": "LAYOUT_ROUTE112", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index a59df37cbd..7adae98f7b 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112_CABLE_CAR_STATION", "name": "Route112_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index b1da3e3cb7..6781b154c5 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38 applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Going up setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index df1b352236..8d9d740280 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113", "name": "Route113", "layout": "LAYOUT_ROUTE113", - "music": "MUS_KAZANBAI", + "music": "MUS_ROUTE113", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 1d5deabd0f..924fbd85dd 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113_GLASS_WORKSHOP", "name": "Route113_GlassWorkshop", "layout": "LAYOUT_HOUSE4", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 48bafee08e..37edf509d0 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114", "name": "Route114", "layout": "LAYOUT_ROUTE114", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 19d87c3534..dd21ff77f2 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", "name": "Route114_FossilManiacsHouse", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 3384df5237..9a8ac70c94 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "name": "Route114_FossilManiacsTunnel", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 2a444d06a7..fcb8edfc99 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_LANETTES_HOUSE", "name": "Route114_LanettesHouse", "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 0be264375a..2d0dbdbaa9 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE115", "name": "Route115", "layout": "LAYOUT_ROUTE115", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_115", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 6c2be79809..247a4b7b15 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116", "name": "Route116", "layout": "LAYOUT_ROUTE116", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 8ced24aa7b..b83971532a 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", "name": "Route116_TunnelersRestHouse", "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 655c430483..d2f45e256f 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117", "name": "Route117", "layout": "LAYOUT_ROUTE117", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 141dd44ca7..5b51aa9589 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117_POKEMON_DAY_CARE", "name": "Route117_PokemonDayCare", "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 09df9a05a8..7b541e629e 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE118", "name": "Route118", "layout": "LAYOUT_ROUTE118", - "music": "MUS_ROUTE_118", + "music": "MUS_ROUTE118", "region_map_section": "MAPSEC_ROUTE_118", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 1a34ad96cd..0197508bb2 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -97,7 +97,7 @@ Route118_EventScript_StevenTrigger2:: @ 81F3EC4 end Route118_EventScript_StevenTrigger:: @ 81F3EE4 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge waitmovement 0 delay 30 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 1ad1ca45ac..fa6391a34e 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119", "name": "Route119", "layout": "LAYOUT_ROUTE119", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 2800126f62..734934d170 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -74,11 +74,11 @@ Route119_EventScript_RivalEncounter:: @ 81F4488 end Route119_EventScript_PlayMayMusic:: @ 81F4501 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route119_EventScript_PlayBrendanMusic:: @ 81F4506 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route119_EventScript_BattleMay:: @ 81F450B diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 6478404e29..0225f1cd39 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_HOUSE", "name": "Route119_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index f1a3b0f99e..9a9e238823 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", "name": "Route119_WeatherInstitute_1F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index a6dc3dfee4..e2e5ebb8a9 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", "name": "Route119_WeatherInstitute_2F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 7e2c156069..85d9d928fb 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -124,7 +124,7 @@ Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0 end Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform waitmessage waitfanfare diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 2f0f736a26..8a7e56ddc3 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE120", "name": "Route120", "layout": "LAYOUT_ROUTE120", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_120", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index f4b4f5e842..e956f62514 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1a7591a934..fdc191ea82 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -19,7 +19,7 @@ Route121_EventScript_SafariZoneSign:: @ 81F5E0F Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18 lockall - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 35516142e0..231d3b4a7a 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", "name": "Route121_SafariZoneEntrance", "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 549f227724..a87a374d2a 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -64,12 +64,12 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 checkmoney 500, 0 compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney - playse SE_REGI + playse SE_SHOP msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT removemoney 500, 0 updatemoneybox 0, 0 msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route121_SafariZoneEntrance_Text_Received30SafariBalls waitfanfare msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 39481f9d75..8c92133471 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE122", "name": "Route122", "layout": "LAYOUT_ROUTE122", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_122", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 4a18635324..1bd25310a1 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123", "name": "Route123", "layout": "LAYOUT_ROUTE123", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index ef72c04ab7..488ee97b50 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", "name": "Route123_BerryMastersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 80d44f1558..370a5f4e4a 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124", "name": "Route124", "layout": "LAYOUT_ROUTE124", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -36,7 +36,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER1" + "map": "MAP_UNDERWATER_ROUTE124" } ], "object_events": [ diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index fc6890729b..a9c16cd22e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", "name": "Route124_DivingTreasureHuntersHouse", "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index c83abccd2c..719e6b699f 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE125", "name": "Route125", "layout": "LAYOUT_ROUTE125", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER7" + "map": "MAP_UNDERWATER_ROUTE125" } ], "object_events": [ diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 3f1aa7dc74..bf7d7027c3 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE126", "name": "Route126", "layout": "LAYOUT_ROUTE126", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER2" + "map": "MAP_UNDERWATER_ROUTE126" } ], "object_events": [ diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 7908f94b0b..6ef7022f47 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE127", "name": "Route127", "layout": "LAYOUT_ROUTE127", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER3" + "map": "MAP_UNDERWATER_ROUTE127" } ], "object_events": [ diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index 9d9b003bab..0bed932d56 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE128", "name": "Route128", "layout": "LAYOUT_ROUTE128", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -31,7 +31,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER4" + "map": "MAP_UNDERWATER_ROUTE128" } ], "object_events": [ diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 0c47261cf2..d5383eb501 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE129", "name": "Route129", "layout": "LAYOUT_ROUTE129", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -26,7 +26,7 @@ { "direction": "dive", "offset": 0, - "map": "MAP_UNDERWATER5" + "map": "MAP_UNDERWATER_ROUTE129" } ], "object_events": [ diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 91fcc7755b..7b4cf047c9 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE130", "name": "Route130", "layout": "LAYOUT_ROUTE130", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 03922e25ee..3599ae556b 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE131", "name": "Route131", "layout": "LAYOUT_ROUTE131", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 0f2d76d101..1d3d9efd0a 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE132", "name": "Route132", "layout": "LAYOUT_ROUTE132", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 66047152c5..80e64638b3 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE133", "name": "Route133", "layout": "LAYOUT_ROUTE133", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 9960b3c146..dd642a8e15 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE134", "name": "Route134", "layout": "LAYOUT_ROUTE134", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 3d2232b9ad..445bc51899 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY", "name": "RustboroCity", "layout": "LAYOUT_RUSTBORO_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 477b0d6584..7b1f4a3d81 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -43,7 +43,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 setvar VAR_ROUTE104_STATE, 1 applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_SCIENTIST applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer @@ -62,13 +62,13 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 setflag FLAG_HAS_MATCH_CALL applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 20 applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -103,7 +103,7 @@ RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD closemessage applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistLeave waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_RUSTBORO_CITY_STATE, 7 @@ -294,7 +294,7 @@ RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6 RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 addobject LOCALID_GRUNT addobject LOCALID_DEVON_EMPLOYEE applymovement LOCALID_GRUNT, RustboroCity_Movement_GruntEscape @@ -706,11 +706,11 @@ RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1 return RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 @@ -856,7 +856,7 @@ RustboroCity_EventScript_MayEncounter:: @ 81E100B msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage @@ -927,7 +927,7 @@ RustboroCity_EventScript_BrendanEncounter:: @ 81E1114 msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index cc19403eaa..081799cd17 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", "name": "RustboroCity_CuttersHouse", "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 3cf7152c94..714f15506c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", "name": "RustboroCity_DevonCorp_1F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 9bc987949b..95a931e94f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", "name": "RustboroCity_DevonCorp_2F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index e33fb2d0f9..eb22fcc43a 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -194,7 +194,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9 RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4 bufferspeciesname 1, SPECIES_LILEEP - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare @@ -243,7 +243,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67 bufferspeciesname 1, SPECIES_ANORITH - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index d92e4272e0..a31a49dd30 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", "name": "RustboroCity_DevonCorp_3F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index d24b4e902f..34a31c692d 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 @@ -52,7 +52,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav waitfanfare setflag FLAG_SYS_POKENAV_GET diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 31341e0b7e..d4ddfb2f6c 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_1F", "name": "RustboroCity_Flat1_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 454a0f1b5f..3756411d72 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_2F", "name": "RustboroCity_Flat1_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 29494765c5..5379567ff8 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_1F", "name": "RustboroCity_Flat2_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 8f3e659cdd..1ba0bbbba2 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_2F", "name": "RustboroCity_Flat2_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 927ff6c344..da911f0045 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_3F", "name": "RustboroCity_Flat2_3F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index e473c3e1ba..36ae306abe 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_GYM", "name": "RustboroCity_Gym", "layout": "LAYOUT_RUSTBORO_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index ce6fdb127b..6d9895fe50 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -96,7 +96,7 @@ RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Gym_Text_RegisteredRoxanne, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 85b4ee2b1d..a57b1a693c 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE1", "name": "RustboroCity_House1", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index dd30ff71ce..fdaed84fc0 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE2", "name": "RustboroCity_House2", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 3a757de8b1..491550a2c0 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE3", "name": "RustboroCity_House3", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 423fbb4e7b..1a5b4549f0 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_MART", "name": "RustboroCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index e6c3326786..633626c4cb 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", "name": "RustboroCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index dbdaddfc62..912e4b263e 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", "name": "RustboroCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index af9b02d988..e299248a0b 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", "name": "RustboroCity_PokemonSchool", "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", - "music": "MUS_P_SCHOOL", + "music": "MUS_SCHOOL", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 0d6ae7d9bf..d8531c879e 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTURF_TUNNEL", "name": "RusturfTunnel", "layout": "LAYOUT_RUSTURF_TUNNEL", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index a342135bf0..17a229ab54 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -316,7 +316,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF RusturfTunnel_EventScript_Grunt:: @ 822D0C2 lock faceplayer - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index dc65b24432..7356e1fe00 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_CORRIDOR", "name": "SSTidalCorridor", "layout": "LAYOUT_SS_TIDAL_CORRIDOR", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index a055c65484..b6fa7428e0 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -17,7 +17,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF special SetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -25,7 +25,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -33,14 +33,14 @@ SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015 SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028 special SetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT return SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT return @@ -55,7 +55,7 @@ SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067 special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -64,7 +64,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT releaseall end @@ -72,7 +72,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093 special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT return @@ -204,7 +204,7 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219 applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottExit waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT waitse removeobject LOCALID_SCOTT applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorReturn diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 25a24c1b94..79331001af 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_LOWER_DECK", "name": "SSTidalLowerDeck", "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 32fe402459..fd65d5ce26 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_ROOMS", "name": "SSTidalRooms", "layout": "LAYOUT_SS_TIDAL_ROOMS", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index baccf04658..2419587d81 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH", "name": "SafariZone_North", "layout": "LAYOUT_SAFARI_ZONE_NORTH", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 7855417f19..9104031072 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHEAST", "name": "SafariZone_Northeast", "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 3974f00ded..1e27def2cd 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHWEST", "name": "SafariZone_Northwest", "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index cae90c79d0..e03b024ae9 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_REST_HOUSE", "name": "SafariZone_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 78ab47f721..562b85b9e4 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTH", "name": "SafariZone_South", "layout": "LAYOUT_SAFARI_ZONE_SOUTH", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 174014f3e9..723e874cc9 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHEAST", "name": "SafariZone_Southeast", "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 95017668e8..42faf1f50a 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHWEST", "name": "SafariZone_Southwest", "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 86e06c2685..e90f1f5c1f 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -2,7 +2,7 @@ "id": "MAP_SCORCHED_SLAB", "name": "ScorchedSlab", "layout": "LAYOUT_SCORCHED_SLAB", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index bc79a5f012..1f7095def6 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "name": "SeafloorCavern_Entrance", "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", @@ -33,7 +33,7 @@ "x": 10, "y": 18, "elevation": 3, - "dest_map": "MAP_UNDERWATER4", + "dest_map": "MAP_UNDERWATER_ROUTE128", "dest_warp_id": 0 }, { diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 0e6bd1bad0..2caa79414b 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM1", "name": "SeafloorCavern_Room1", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 1391cc3959..bfdd30499b 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM2", "name": "SeafloorCavern_Room2", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index e40bcbcf5b..478e108be2 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM3", "name": "SeafloorCavern_Room3", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 80de38537a..9ea3528a31 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM4", "name": "SeafloorCavern_Room4", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 9d6ca9e6af..415e2a718f 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM5", "name": "SeafloorCavern_Room5", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index eb4c7f9d9e..598f4a0427 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM6", "name": "SeafloorCavern_Room6", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 0f135d36a1..243a1f9d1a 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM7", "name": "SeafloorCavern_Room7", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 90cd3ae7a0..7c5d5c8200 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM8", "name": "SeafloorCavern_Room8", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index cd52634882..94ef88e849 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM9", "name": "SeafloorCavern_Room9", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6672519367..63c5853c35 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -18,7 +18,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 @@ -43,13 +43,13 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 special WaitWeather waitstate setvar VAR_RESULT, 1 - playse SE_W197 + playse SE_M_DETECT dofieldeffectsparkle 16, 42, 0 waitfieldeffect FLDEFF_SPARKLE closemessage setvar VAR_RESULT, 0 - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special DoOrbEffect applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index febf5defac..1f8e741d8f 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_INNER_ROOM", "name": "SealedChamber_InnerRoom", "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 15c98e57e5..c31bb7efce 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8 compare VAR_RESULT, FALSE goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect fadeoutbgm 0 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index 88694940b5..e16350d7e7 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", "name": "SealedChamber_OuterRoom", "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8690a8aadc..3fb6157cca 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index feee5c585d..ca15e39f18 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index c26af7cba7..356b4894d4 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 3dc34e1884..078bada8e6 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 0671d40a3d..6f2dc92f24 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 5fc3df0e50..11559c12fb 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 29a27ad397..c2dbb7fc45 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 05d9fff3ef..e7147ae85d 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 8a3be38be9..fd264fc6cf 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 71c64bb775..b60b3bbff2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index e30c50b466..079837a621 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index d1abb1a74b..10fbbfeb0d 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 5dba2b1435..e0d1015cbb 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index cdd5b1e00b..879b7464e9 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index cbdb08664e..6751a74147 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 3a7caee6be..c193b8348e 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index f9430cf0df..cd0cad5f08 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 79b1928b18..1ac393a158 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 9454cea0b7..b7eec22440 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 8f9b0ebf7d..0e068ec94d 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 2bdf097c9a..1d873bfe29 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 79d4e6950c..af2e957bc6 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 29ea865cad..d78aa28628 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index df2db85bd9..0ca4bc4d32 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 8dec3b1e28..9d3c5156b6 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_HighTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index 280397a932..2f183d3ae5 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", "name": "ShoalCave_HighTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index c357ad5d73..ba71e10856 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_LowTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index d8ecab059c..ea4f0cedf4 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", "name": "ShoalCave_LowTideIceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 1d0f44e0e5..bf172e8b4e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "name": "ShoalCave_LowTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 40adf38ccd..719841ec0d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", "name": "ShoalCave_LowTideLowerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index a2ea91b5b1..4207c95843 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", "name": "ShoalCave_LowTideStairsRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 17528b619d..6ce499be2f 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_1F", "name": "SkyPillar_1F", "layout": "LAYOUT_SKY_PILLAR_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 1430f9dc7a..7b534c2f75 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_2F", "name": "SkyPillar_2F", "layout": "LAYOUT_SKY_PILLAR_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index ddec299b5f..c05324f109 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_3F", "name": "SkyPillar_3F", "layout": "LAYOUT_SKY_PILLAR_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 9c12a20712..7b5ad062e3 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_4F", "name": "SkyPillar_4F", "layout": "LAYOUT_SKY_PILLAR_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 2638cb92c0..5be104fb0f 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_5F", "name": "SkyPillar_5F", "layout": "LAYOUT_SKY_PILLAR_5F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 709f0af8d4..c880da6ea9 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_ENTRANCE", "name": "SkyPillar_Entrance", "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 35721fd41a..b0d4e198b4 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_OUTSIDE", "name": "SkyPillar_Outside", "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 60a1702abc..2e0495bcaa 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 delay 30 msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT closemessage - playse SE_KAIDAN + playse SE_EXIT fadescreenswapbuffers FADE_TO_BLACK clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_SOOTOPOLIS_CITY_STATE, 4 diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 8da3ca5254..90301c53bf 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_TOP", "name": "SkyPillar_Top", "layout": "LAYOUT_SKY_PILLAR_TOP", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 40ebfbc119..6ffed4b454 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY", "name": "SlateportCity", "layout": "LAYOUT_SLATEPORT_CITY", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 055e13565b..983ce97969 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -91,7 +91,7 @@ SlateportCity_EventScript_ScottScene:: @ 81DCD1C msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT waitfanfare closemessage @@ -170,7 +170,7 @@ SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4 compare VAR_RESULT, FALSE call_if_eq SlateportCity_EventScript_MonEVsNotMaxed msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message SlateportCity_Text_ReceivedEffortRibbon waitfanfare msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT @@ -603,7 +603,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFastestLeft diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index 4bc1ea9f15..27cce84b49 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM", "name": "SlateportCity_BattleTentBattleRoom", "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index e285ccdb1d..c9cd4b1a71 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR", "name": "SlateportCity_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 85a95ded86..c018f54b9d 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -60,7 +60,7 @@ SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE factory_setopponentmons factory_resethelditems msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index e2c4395919..efd03e1e28 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", "name": "SlateportCity_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 20f3c3e075..bdc8eb05f9 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize @ Odd that it uses Tower's instead of Factory's or its own waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 19bb83a069..17d3c8940f 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HARBOR", "name": "SlateportCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 5d8dad1db2..644911ea63 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -21,7 +21,7 @@ SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5 return SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9 - savebgm MUS_AQA_0 + savebgm MUS_ENCOUNTER_AQUA setobjectxyperm LOCALID_CAPT_STERN, 12, 13 setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index d1bdfa1e3d..5ccc92566e 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE", "name": "SlateportCity_House", "layout": "LAYOUT_HOUSE2", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 8c5924ce83..45d3225553 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_MART", "name": "SlateportCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index a1728f78a5..c0a94fd69e 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE", "name": "SlateportCity_NameRatersHouse", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 00b2e8912e..7748f54384 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", "name": "SlateportCity_OceanicMuseum_1F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 8af4af40c0..90c9b93b79 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 checkmoney 50, 0 compare VAR_RESULT, FALSE goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney - playse SE_REGI + playse SE_SHOP removemoney 50, 0 updatemoneybox 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT @@ -191,7 +191,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93 SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_FAMILIAR_GRUNT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index af23dffefb..7b78802e33 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", "name": "SlateportCity_OceanicMuseum_2F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 8efd464c41..bba75dbd1e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 1 + playbgm MUS_ENCOUNTER_AQUA, 1 addobject LOCALID_GRUNT_1 applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 @@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty removeobject LOCALID_CAPT_STERN diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index fe730efd70..91132909a1 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", "name": "SlateportCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index d2204dabce..74b5ee63c3 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", "name": "SlateportCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index ae27c318b4..b1e4b0f8bf 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", "name": "SlateportCity_PokemonFanClub", "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 45e5f57346..66cdd6a1df 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", "name": "SlateportCity_SternsShipyard_1F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 452c3f47a8..1b89b2bfa4 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", "name": "SlateportCity_SternsShipyard_2F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 41e5cf61ab..d4c71db612 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 2979f104de..e6ceb64183 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -235,7 +235,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft @@ -335,7 +335,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft @@ -528,10 +528,10 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E removeobject LOCALID_GROUDON removeobject LOCALID_KYOGRE addobject LOCALID_RAYQUAZA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate - playse SE_T_KAMI + playse SE_THUNDER special SpawnCameraObject applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp waitmovement 0 @@ -562,7 +562,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_RUNECITY + fadenewbgm MUS_SOOTOPOLIS delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32 @@ -581,7 +581,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE removeobject LOCALID_GROUDON removeobject LOCALID_KYOGRE addobject LOCALID_RAYQUAZA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate special SpawnCameraObject @@ -615,7 +615,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53 diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 72d7c2d2b3..46baea29d2 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", "name": "SootopolisCity_Gym_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 66588ba08b..ae5bfd1084 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -46,7 +46,7 @@ SootopolisCity_Gym_1F_OnFrame: @ 8224ECB SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -54,7 +54,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -62,7 +62,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -72,7 +72,7 @@ SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 delay 20 applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate @@ -110,7 +110,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82 call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 5706139f2f..3badb1c526 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", "name": "SootopolisCity_Gym_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 9db373ceda..26c47c4323 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", "name": "SootopolisCity_House1", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 6ffeb11f8e..3fe0baf484 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", "name": "SootopolisCity_House2", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index d6cb1f09b6..00d82637e3 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", "name": "SootopolisCity_House3", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 7ff8d9182f..e811785d00 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", "name": "SootopolisCity_House4", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 2a335e4bbd..6b25c5af69 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", "name": "SootopolisCity_House5", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index e6b37ca19c..365503e8fa 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", "name": "SootopolisCity_House6", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 5f66d082ad..47d98c9145 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", "name": "SootopolisCity_House7", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index d02aec2bb9..143fdf9f23 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", "name": "SootopolisCity_LotadAndSeedotHouse", "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index e7433e7171..55686a14fc 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MART", "name": "SootopolisCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 9ccd91d9b5..a7fa187602 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", "name": "SootopolisCity_MysteryEventsHouse_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index 3911f3e2b8..82885ebcc8 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", "name": "SootopolisCity_MysteryEventsHouse_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 2330f08eaf..8dac70dea1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", "name": "SootopolisCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index ca779dd4b7..fd85b236b5 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", "name": "SootopolisCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 67ee0fd3c7..8fe4bcf292 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", "name": "SouthernIsland_Exterior", "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 14530c995e..179ab1997d 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_INTERIOR", "name": "SouthernIsland_Interior", "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index c7dfeeb3dd..b186bddb28 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -2,7 +2,7 @@ "id": "MAP_TERRA_CAVE_END", "name": "TerraCave_End", "layout": "LAYOUT_TERRA_CAVE_END", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_TERRA_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index 9a96504871..1ddc768e27 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_TERRA_CAVE_ENTRANCE", "name": "TerraCave_Entrance", "layout": "LAYOUT_TERRA_CAVE_ENTRANCE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_TERRA_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index d0ed8e5247..0d3dd5477b 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 30f80b810c..d14bbb2938 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_1F", "name": "TrainerHill_1F", "layout": "LAYOUT_TRAINER_HILL_1F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index e94948c33c..a4c9bca7dc 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_2F", "name": "TrainerHill_2F", "layout": "LAYOUT_TRAINER_HILL_2F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index 6e3ef9c510..069ca83ac5 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_3F", "name": "TrainerHill_3F", "layout": "LAYOUT_TRAINER_HILL_3F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 2b62322e93..f195d9e93a 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_4F", "name": "TrainerHill_4F", "layout": "LAYOUT_TRAINER_HILL_4F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index dc259fde0f..3d56ff4761 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ELEVATOR", "name": "TrainerHill_Elevator", "layout": "LAYOUT_BATTLE_ELEVATOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index ed85405c1e..b2c20d050d 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ENTRANCE", "name": "TrainerHill_Entrance", "layout": "LAYOUT_TRAINER_HILL_ENTRANCE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 077709053d..b5b0f716ca 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -69,7 +69,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160 waitmovement 0 setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK waitse setvar VAR_TEMP_D, 0 releaseall diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 244214ad3d..16020a762a 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ROOF", "name": "TrainerHill_Roof", "layout": "LAYOUT_TRAINER_HILL_ROOF", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index e4e2cbb49e..e239ed0105 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -22,7 +22,7 @@ TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2 case 2, TrainerHill_Roof_EventScript_CheckFinalTime TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020 msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message gText_ObtainedTheItem waitfanfare waitmessage diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc deleted file mode 100644 index 107a038a8c..0000000000 --- a/data/maps/Underwater1/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater1_MapScripts:: @ 81F7722 - .byte 0 - diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc deleted file mode 100644 index 80c854c636..0000000000 --- a/data/maps/Underwater2/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater2_MapScripts:: @ 81F7723 - .byte 0 - diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc deleted file mode 100644 index e75acd635b..0000000000 --- a/data/maps/Underwater3/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater3_MapScripts:: @ 81F7724 - map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume - .byte 0 - -Underwater3_OnResume: @ 81F772A - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc deleted file mode 100644 index 295c273560..0000000000 --- a/data/maps/Underwater4/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -Underwater4_MapScripts:: @ 81F7730 - .byte 0 - diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc deleted file mode 100644 index 235d25aba5..0000000000 --- a/data/maps/Underwater5/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater5_MapScripts:: @ 81F7731 - map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume - .byte 0 - -Underwater5_OnResume: @ 81F7737 - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc deleted file mode 100644 index 21b639cd85..0000000000 --- a/data/maps/Underwater6/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater6_MapScripts:: @ 81F773D - map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume - .byte 0 - -Underwater6_OnResume: @ 81F7743 - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc deleted file mode 100644 index 4215dced9f..0000000000 --- a/data/maps/Underwater7/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater7_MapScripts:: @ 81F7749 - map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume - .byte 0 - -Underwater7_OnResume: @ 81F774F - call AbnormalWeather_Underwater_SetupEscapeWarp - end - diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index c12531e484..c053fb1210 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_MARINE_CAVE", "name": "Underwater_MarineCave", "layout": "LAYOUT_UNDERWATER_MARINE_CAVE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater_Route105/map.json similarity index 79% rename from data/maps/Underwater6/map.json rename to data/maps/Underwater_Route105/map.json index 971f2755c2..890ccb2a8f 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater_Route105/map.json @@ -1,9 +1,9 @@ { - "id": "MAP_UNDERWATER6", - "name": "Underwater6", - "layout": "LAYOUT_UNDERWATER6", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", + "id": "MAP_UNDERWATER_ROUTE105", + "name": "Underwater_Route105", + "layout": "LAYOUT_UNDERWATER_ROUTE105", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_105", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", diff --git a/data/maps/Underwater_Route105/scripts.inc b/data/maps/Underwater_Route105/scripts.inc new file mode 100644 index 0000000000..41cd8bfbe7 --- /dev/null +++ b/data/maps/Underwater_Route105/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route105_MapScripts:: @ 81F773D + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route105_OnResume + .byte 0 + +Underwater_Route105_OnResume: @ 81F7743 + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater_Route124/map.json similarity index 71% rename from data/maps/Underwater1/map.json rename to data/maps/Underwater_Route124/map.json index cc77e951d3..46bc141a85 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater_Route124/map.json @@ -1,8 +1,8 @@ { - "id": "MAP_UNDERWATER1", - "name": "Underwater1", - "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "id": "MAP_UNDERWATER_ROUTE124", + "name": "Underwater_Route124", + "layout": "LAYOUT_UNDERWATER_ROUTE124", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", @@ -16,7 +16,7 @@ { "direction": "down", "offset": 0, - "map": "MAP_UNDERWATER2" + "map": "MAP_UNDERWATER_ROUTE126" }, { "direction": "emerge", @@ -34,7 +34,7 @@ "y": 51, "elevation": 0, "item": "ITEM_CARBOS", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS" }, { "type": "hidden_item", @@ -42,7 +42,7 @@ "y": 40, "elevation": 0, "item": "ITEM_GREEN_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD" }, { "type": "hidden_item", @@ -50,7 +50,7 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL" }, { "type": "hidden_item", @@ -58,7 +58,7 @@ "y": 54, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL" }, { "type": "hidden_item", @@ -66,7 +66,7 @@ "y": 64, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1" }, { "type": "hidden_item", @@ -74,7 +74,7 @@ "y": 5, "elevation": 3, "item": "ITEM_CALCIUM", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM" }, { "type": "hidden_item", @@ -82,7 +82,7 @@ "y": 36, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2" } ] } diff --git a/data/maps/Underwater_Route124/scripts.inc b/data/maps/Underwater_Route124/scripts.inc new file mode 100644 index 0000000000..2a72dfb113 --- /dev/null +++ b/data/maps/Underwater_Route124/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route124_MapScripts:: @ 81F7722 + .byte 0 + diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater_Route125/map.json similarity index 79% rename from data/maps/Underwater7/map.json rename to data/maps/Underwater_Route125/map.json index cf33280fe4..c32bb57e86 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater_Route125/map.json @@ -1,9 +1,9 @@ { - "id": "MAP_UNDERWATER7", - "name": "Underwater7", - "layout": "LAYOUT_UNDERWATER7", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_UNK1", + "id": "MAP_UNDERWATER_ROUTE125", + "name": "Underwater_Route125", + "layout": "LAYOUT_UNDERWATER_ROUTE125", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", diff --git a/data/maps/Underwater_Route125/scripts.inc b/data/maps/Underwater_Route125/scripts.inc new file mode 100644 index 0000000000..662120e5e6 --- /dev/null +++ b/data/maps/Underwater_Route125/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route125_MapScripts:: @ 81F7749 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route125_OnResume + .byte 0 + +Underwater_Route125_OnResume: @ 81F774F + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater_Route126/map.json similarity index 70% rename from data/maps/Underwater2/map.json rename to data/maps/Underwater_Route126/map.json index f402f8ea8e..993bb79070 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater_Route126/map.json @@ -1,9 +1,9 @@ { - "id": "MAP_UNDERWATER2", - "name": "Underwater2", - "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_125", + "id": "MAP_UNDERWATER_ROUTE126", + "name": "Underwater_Route126", + "layout": "LAYOUT_UNDERWATER_ROUTE126", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", @@ -16,12 +16,12 @@ { "direction": "up", "offset": 0, - "map": "MAP_UNDERWATER1" + "map": "MAP_UNDERWATER_ROUTE124" }, { "direction": "right", "offset": 0, - "map": "MAP_UNDERWATER3" + "map": "MAP_UNDERWATER_ROUTE127" }, { "direction": "emerge", @@ -47,7 +47,7 @@ "y": 17, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE" }, { "type": "hidden_item", @@ -55,7 +55,7 @@ "y": 19, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL" }, { "type": "hidden_item", @@ -63,7 +63,7 @@ "y": 19, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST" }, { "type": "hidden_item", @@ -71,7 +71,7 @@ "y": 36, "elevation": 3, "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL" }, { "type": "hidden_item", @@ -79,7 +79,7 @@ "y": 39, "elevation": 3, "item": "ITEM_IRON", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON" }, { "type": "hidden_item", @@ -87,7 +87,7 @@ "y": 35, "elevation": 3, "item": "ITEM_YELLOW_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD" }, { "type": "hidden_item", @@ -95,7 +95,7 @@ "y": 60, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL" }, { "type": "hidden_item", @@ -103,7 +103,7 @@ "y": 77, "elevation": 3, "item": "ITEM_BLUE_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD" } ] } diff --git a/data/maps/Underwater_Route126/scripts.inc b/data/maps/Underwater_Route126/scripts.inc new file mode 100644 index 0000000000..71d43e1417 --- /dev/null +++ b/data/maps/Underwater_Route126/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route126_MapScripts:: @ 81F7723 + .byte 0 + diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater_Route127/map.json similarity index 73% rename from data/maps/Underwater3/map.json rename to data/maps/Underwater_Route127/map.json index 69af7637fc..b96f79c5db 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater_Route127/map.json @@ -1,9 +1,9 @@ { - "id": "MAP_UNDERWATER3", - "name": "Underwater3", - "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_126", + "id": "MAP_UNDERWATER_ROUTE127", + "name": "Underwater_Route127", + "layout": "LAYOUT_UNDERWATER_ROUTE127", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", @@ -21,12 +21,12 @@ { "direction": "left", "offset": 0, - "map": "MAP_UNDERWATER2" + "map": "MAP_UNDERWATER_ROUTE126" }, { "direction": "down", "offset": 0, - "map": "MAP_UNDERWATER4" + "map": "MAP_UNDERWATER_ROUTE128" } ], "object_events": [], @@ -54,7 +54,7 @@ "y": 42, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE" }, { "type": "hidden_item", @@ -62,7 +62,7 @@ "y": 36, "elevation": 3, "item": "ITEM_HP_UP", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP" }, { "type": "hidden_item", @@ -70,7 +70,7 @@ "y": 72, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE" }, { "type": "hidden_item", @@ -78,7 +78,7 @@ "y": 20, "elevation": 3, "item": "ITEM_RED_SHARD", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD" } ] } diff --git a/data/maps/Underwater_Route127/scripts.inc b/data/maps/Underwater_Route127/scripts.inc new file mode 100644 index 0000000000..552b9aab82 --- /dev/null +++ b/data/maps/Underwater_Route127/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route127_MapScripts:: @ 81F7724 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route127_OnResume + .byte 0 + +Underwater_Route127_OnResume: @ 81F772A + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater_Route128/map.json similarity index 72% rename from data/maps/Underwater4/map.json rename to data/maps/Underwater_Route128/map.json index 1569233020..f80cf41a68 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater_Route128/map.json @@ -1,9 +1,9 @@ { - "id": "MAP_UNDERWATER4", - "name": "Underwater4", - "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_127", + "id": "MAP_UNDERWATER_ROUTE128", + "name": "Underwater_Route128", + "layout": "LAYOUT_UNDERWATER_ROUTE128", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", @@ -16,7 +16,7 @@ { "direction": "up", "offset": 0, - "map": "MAP_UNDERWATER3" + "map": "MAP_UNDERWATER_ROUTE127" }, { "direction": "emerge", @@ -42,7 +42,7 @@ "y": 19, "elevation": 3, "item": "ITEM_PROTEIN", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN" }, { "type": "hidden_item", @@ -50,7 +50,7 @@ "y": 18, "elevation": 3, "item": "ITEM_PEARL", - "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL" } ] } diff --git a/data/maps/Underwater_Route128/scripts.inc b/data/maps/Underwater_Route128/scripts.inc new file mode 100644 index 0000000000..a050afd938 --- /dev/null +++ b/data/maps/Underwater_Route128/scripts.inc @@ -0,0 +1,3 @@ +Underwater_Route128_MapScripts:: @ 81F7730 + .byte 0 + diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater_Route129/map.json similarity index 84% rename from data/maps/Underwater5/map.json rename to data/maps/Underwater_Route129/map.json index c50b8be533..45775bd6b4 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater_Route129/map.json @@ -1,8 +1,8 @@ { - "id": "MAP_UNDERWATER5", - "name": "Underwater5", - "layout": "LAYOUT_UNDERWATER5", - "music": "MUS_DEEPDEEP", + "id": "MAP_UNDERWATER_ROUTE129", + "name": "Underwater_Route129", + "layout": "LAYOUT_UNDERWATER_ROUTE129", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_129", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_Route129/scripts.inc b/data/maps/Underwater_Route129/scripts.inc new file mode 100644 index 0000000000..f9f84841e5 --- /dev/null +++ b/data/maps/Underwater_Route129/scripts.inc @@ -0,0 +1,8 @@ +Underwater_Route129_MapScripts:: @ 81F7731 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route129_OnResume + .byte 0 + +Underwater_Route129_OnResume: @ 81F7737 + call AbnormalWeather_Underwater_SetupEscapeWarp + end + diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index dd5117aa4f..74526bc4dc 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_ROUTE134", "name": "Underwater_Route134", "layout": "LAYOUT_UNDERWATER_ROUTE134", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 90201d3b73..d25a3600dd 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -2,8 +2,8 @@ "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", - "music": "MUS_DEEPDEEP", - "region_map_section": "MAPSEC_UNDERWATER_128", + "music": "MUS_UNDERWATER", + "region_map_section": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", @@ -72,7 +72,7 @@ "x": 6, "y": 7, "elevation": 0, - "dest_map": "MAP_UNDERWATER4", + "dest_map": "MAP_UNDERWATER_ROUTE128", "dest_warp_id": 0 } ], diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 98bbcc8503..5f3b990559 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEALED_CHAMBER", "name": "Underwater_SealedChamber", "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index cc2d66ff21..0d1363ff6c 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", "name": "Underwater_SootopolisCity", "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", @@ -19,14 +19,14 @@ "x": 9, "y": 8, "elevation": 0, - "dest_map": "MAP_UNDERWATER2", + "dest_map": "MAP_UNDERWATER_ROUTE126", "dest_warp_id": 0 }, { "x": 10, "y": 8, "elevation": 0, - "dest_map": "MAP_UNDERWATER2", + "dest_map": "MAP_UNDERWATER_ROUTE126", "dest_warp_id": 0 } ], diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 1ee2041373..3d19cd55fc 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNION_ROOM", "name": "UnionRoom", "layout": "LAYOUT_UNION_ROOM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index cf60772593..72ed407eed 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29", "name": "UnknownLinkContestRoom_25_29", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index c51109ee9c..cd4d6fddd8 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30", "name": "UnknownLinkContestRoom_25_30", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index 27b5503820..975ec382d7 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31", "name": "UnknownLinkContestRoom_25_31", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 0c20ee1f83..d2d673adc3 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32", "name": "UnknownLinkContestRoom_25_32", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index aee753f225..f73ffe22e1 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33", "name": "UnknownLinkContestRoom_25_33", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index ebd07e9fae..f5ddbbe5ae 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34", "name": "UnknownLinkContestRoom_25_34", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c4b736f80a..94d140c05e 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN", "name": "VerdanturfTown", "layout": "LAYOUT_VERDANTURF_TOWN", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 9ed2441ddf..72eca1d95c 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", "name": "VerdanturfTown_BattleTentBattleRoom", "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 86b5f3ec1e..ad77cdf5fc 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -78,7 +78,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 0209c02d9d..2b875b9009 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR", "name": "VerdanturfTown_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index cc294e47db..d4a8ccfa57 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", "name": "VerdanturfTown_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 7a3aa605ca..f7a03b1ec9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -55,7 +55,7 @@ VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message BattleFrontier_BattleDomeLobby_Text_ReceivedPrize @ Odd that it used Dome's copy instead of Palace's waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT closemessage diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 7aaedcd233..7fa3104261 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", "name": "VerdanturfTown_FriendshipRatersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index bcc51079f5..d552e914a7 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_HOUSE", "name": "VerdanturfTown_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 96fa213664..b8183646ca 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_MART", "name": "VerdanturfTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 74f3e342be..8e3fc3e286 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", "name": "VerdanturfTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index d7a51eba7b..2edb6602db 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", "name": "VerdanturfTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 08b5348c7d..43a5b9c441 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", "name": "VerdanturfTown_WandasHouse", "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d0ff9e4406..5f3271c89e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 9a387aa522..6e290ce6de 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B1F", "name": "VictoryRoad_B1F", "layout": "LAYOUT_VICTORY_ROAD_B1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 7e59f9f272..6ee56389f7 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B2F", "name": "VictoryRoad_B2F", "layout": "LAYOUT_VICTORY_ROAD_B2F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 2821ad20fc..4201e814f4 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -86,13 +86,13 @@ "Route132", "Route133", "Route134", - "Underwater1", - "Underwater2", - "Underwater3", - "Underwater4", - "Underwater5", - "Underwater6", - "Underwater7" + "Underwater_Route124", + "Underwater_Route126", + "Underwater_Route127", + "Underwater_Route128", + "Underwater_Route129", + "Underwater_Route105", + "Underwater_Route125" ], "gMapGroup1": [ "LittlerootTown_BrendansHouse_1F", @@ -672,13 +672,13 @@ "Route132", "Route133", "Route134", - "Underwater6", - "Underwater1", - "Underwater7", - "Underwater2", - "Underwater3", - "Underwater4", - "Underwater5", + "Underwater_Route105", + "Underwater_Route124", + "Underwater_Route125", + "Underwater_Route126", + "Underwater_Route127", + "Underwater_Route128", + "Underwater_Route129", "SafariZone_Northwest", "SafariZone_North", "SafariZone_Southwest", diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index d98add74d8..7ad8e9e3ae 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -6,6 +6,8 @@ .set LOCALID_EXPERT_M, 16 .set LOCALID_GIRL, 17 +.set NUM_OPPONENTS, VAR_0x8009 + BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE .string "Oh? Did you want to make some {POKEBLOCK}S\n" .string "with this old-timer?$" @@ -243,7 +245,7 @@ BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4 BerryBlender_EventScript_BerryBlender1:: @ 8293C3E lockall goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent - setvar VAR_0x8009, 1 + setvar NUM_OPPONENTS, 1 applymovement LOCALID_EXPERT_M, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO @@ -307,9 +309,8 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE goto BerryBlender_EventScript_UseBerryBlender1 end -@ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left BerryBlender_EventScript_DoBerryBlending: @ 8293D2C - copyvar VAR_0x8004, VAR_0x8009 + copyvar VAR_0x8004, NUM_OPPONENTS fadescreen FADE_TO_BLACK special DoBerryBlending waitstate @@ -328,7 +329,7 @@ BerryBlender_EventScript_Blender1NoCase: @ 8293D43 BerryBlender_EventScript_BerryBlender2:: @ 8293D4D lockall - setvar VAR_0x8009, 2 + setvar NUM_OPPONENTS, 2 applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection applymovement LOCALID_MAN, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 @@ -393,7 +394,7 @@ BerryBlender_EventScript_Blender2NoCase: @ 8293E14 BerryBlender_EventScript_BerryBlender3:: @ 8293E1E lockall setvar VAR_0x8008, LOCALID_POKEFAN_F - setvar VAR_0x8009, 3 + setvar NUM_OPPONENTS, 3 applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace @@ -458,7 +459,7 @@ BerryBlender_EventScript_Blender3NoCase: @ 8293EF1 BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB lockall - setvar VAR_0x8009, 1 + setvar NUM_OPPONENTS, 1 msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster @@ -636,7 +637,7 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139 end BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, 0 @ number of opponents, 0 indicates Link fadescreen FADE_TO_BLACK removeobject 240 @ Unclear where these local IDs come from, removeobject 239 @ but presumably they'd be the 4 link players diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1e121678ee..fe10af4b3d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -122,7 +122,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448 special IncrementDailyPickedBerries special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry - playfanfare MUS_ME_KINOMI + playfanfare MUS_OBTAIN_BERRY waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 66cf74f0a9..b81fbb4d54 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -132,7 +132,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85 call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -142,7 +142,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D call CableClub_EventScript_CloseLinkAndExitLinkRoom call EventScript_CloseMossdeepGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -165,7 +165,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7 call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -187,7 +187,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C call CableClub_EventScript_PlayerExitRecordCorner call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -209,7 +209,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -372,7 +372,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -477,7 +477,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -552,7 +552,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -955,7 +955,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1285,7 +1285,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1481,7 +1481,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_OpenMossdeepGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index b55c932ee5..1cc3340049 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 82A8337 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_UNDEFINED waitstate @@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 82A8350 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 special DoFallWarp waitstate diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 984e1b93b4..1ef723c375 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -401,13 +401,13 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2 call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_CheckIfContestWithRSPlayer addobject LOCALID_POKEBALL - playse SE_DANSA + playse SE_LEDGE lockall applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 waitmovement 0 releaseall addvar VAR_0x8006, -1 - playse SE_BOWA2 + playse SE_BALL_OPEN special ShowContestEntryMonPic call ContestHall_EventScript_EntryXTrainersMon return @@ -427,7 +427,7 @@ ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229 ContestHall_EventScript_AudienceVote:: @ 827A230 call ContestHall_EventScript_AudienceWillVote call ContestHall_EventScript_VotingUnderWay - playse SE_W227B + playse SE_M_ENCORE2 waitmessage call ContestHall_EventScript_AudienceLookAround applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2 @@ -481,7 +481,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 call ContestHall_EventScript_TryWaitForLink applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 call ContestHall_EventScript_VObjectAudienceLookAround applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown @@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5 setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm MUS_CON_FAN, 0 + playbgm MUS_CONTEST_WINNER, 0 return ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB @@ -1005,7 +1005,7 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4 call ContestHall_EventScript_CongratsWinner applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 return @@ -1117,7 +1117,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36 releaseall call ContestHall_EventScript_WinnerApproachForPrize call ContestHall_EventScript_GivePrizeIfWinner - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 call ContestHall_EventScript_AudienceLookAround delay 30 @@ -1266,7 +1266,7 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF setflag FLAG_SYS_RIBBON_GET lockall msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT waitfanfare special BufferContestWinnerMonName diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 87995581fa..ea85525105 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83 Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D message Route117_Text_ReceivedEgg - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT @@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_SHOP msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 3b395de21b..f4eb6393b8 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 - playse SE_TRACK_DOOR + playse SE_TRUCK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 7f629e5dbd..40ead8e585 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -259,9 +259,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689 end LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 - playse SE_SEIKAI + playse SE_SUCCESS delay 10 - playse SE_SEIKAI + playse SE_SUCCESS msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end @@ -269,9 +269,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7 special BufferQuizCorrectAnswer special BufferQuizPrizeName - playse SE_HAZURE + playse SE_FAILURE delay 10 - playse SE_HAZURE + playse SE_FAILURE msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index cc947e396d..c51558e9e3 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -14,7 +14,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C vmessage sText_MysteryGiftEgg waitmessage waitbuttonpress - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare release end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 3afd92588a..19f57d9d52 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -65,11 +65,11 @@ EventScript_NoRoomForItem:: @ 8271BA9 return EventScript_PlayFanfareObtainedItem:: @ 8271BAF - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM return EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM return Std_ObtainDecoration:: @ 8271BB7 @@ -87,7 +87,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5 return EventScript_ObtainedDecor:: @ 8271BE0 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message gText_ObtainedTheDecor waitfanfare msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 440f47a6ae..684b27e71e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -73,7 +73,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799 call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale compare VAR_RESULT, FEMALE call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_0x8008 releaseall end @@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 - playbgm MUS_INTER_V, 0 + playbgm MUS_ENCOUNTER_INTERVIEWER, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale @@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 - playbgm MUS_INTER_V, 0 + playbgm MUS_ENCOUNTER_INTERVIEWER, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale @@ -334,7 +334,7 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19 msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 6a811d9354..d04a16b587 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ SafariZone_EventScript_Retire:: @ 82A4B85 SafariZone_EventScript_TimesUp:: @ 82A4B8A lockall - playse SE_PINPON + playse SE_DING_DONG message SafariZone_Text_TimesUp waitmessage waitbuttonpress @@ -33,7 +33,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A SafariZone_EventScript_OutOfBalls:: @ 82A4B9B lockall - playse SE_PINPON + playse SE_DING_DONG message SafariZone_Text_OutOfBalls waitmessage waitbuttonpress diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 0de890aa60..132bdd19ca 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -144,7 +144,7 @@ SecretBase_EventScript_ShrubEnter:: @ 8275B4D SecretBase_EventScript_InitSecretBase:: @ 8275B5B closemessage - playse SE_KAIDAN + playse SE_EXIT setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 special SetPlayerSecretBase @@ -164,7 +164,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81 compare VAR_RESULT, YES goto_if_eq SecretBase_EventScript_SetAsBase closemessage - playse SE_KAIDAN + playse SE_EXIT special ClearAndLeaveSecretBase end @@ -183,7 +183,7 @@ SecretBase_Movement_275BB4: @ 8275BB4 SecretBase_EventScript_Enter:: @ 8275BB7 lockall setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN + playse SE_EXIT special IsCurSecretBaseOwnedByAnotherPlayer compare VAR_RESULT, FALSE goto_if_eq SecretBase_EventScript_EnterPlayersBase diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index 1d82bb381b..10b46700e7 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -29,7 +29,7 @@ Std_MsgboxYesNo: @ 8271332 Std_MsgboxGetPoints: @ 827133C message 0x0 - playfanfare MUS_ME_POINTGET + playfanfare MUS_OBTAIN_B_POINTS waitfanfare waitmessage return diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc index 59577e8a8a..c77e628ee5 100644 --- a/data/scripts/trainer_script.inc +++ b/data/scripts/trainer_script.inc @@ -3,7 +3,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 buffertrainername 1, VAR_0x8000 closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/gflib/bg.c b/gflib/bg.c index 66dd81a25e..12c42d1248 100644 --- a/gflib/bg.c +++ b/gflib/bg.c @@ -34,8 +34,8 @@ struct BgConfig2 u32 unk_3:18; void* tilemap; - s32 bg_x; - s32 bg_y; + s32 bg_x; // Maybe unsigned, but game treats it as if it is signed a LOT. + s32 bg_y; // Same for this variable. }; static struct BgControl sGpuBgConfigs; @@ -621,17 +621,15 @@ s32 GetBgX(u8 bg) { if (IsInvalidBg32(bg)) return -1; - else if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) + if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) return -1; - else - return sGpuBgConfigs2[bg].bg_x; + return sGpuBgConfigs2[bg].bg_x; } s32 ChangeBgY(u8 bg, s32 value, u8 op) { u8 mode; - u16 temp1; - u16 temp2; + u16 temp1, temp2; if (IsInvalidBg32(bg) || !GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) { @@ -700,8 +698,7 @@ s32 ChangeBgY(u8 bg, s32 value, u8 op) s32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) { u8 mode; - u16 temp1; - u16 temp2; + u16 temp1, temp2; if (IsInvalidBg32(bg) || !GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) { @@ -772,10 +769,9 @@ s32 GetBgY(u8 bg) { if (IsInvalidBg32(bg)) return -1; - else if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) + if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) return -1; - else - return sGpuBgConfigs2[bg].bg_y; + return sGpuBgConfigs2[bg].bg_y; } void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle) @@ -874,81 +870,77 @@ void* GetBgTilemapBuffer(u8 bg) { if (IsInvalidBg32(bg)) return NULL; - else if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) + if (!GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE)) return NULL; - else - return sGpuBgConfigs2[bg].tilemap; + return sGpuBgConfigs2[bg].tilemap; } void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset) { - if (!IsInvalidBg32(bg) && !IsTileMapOutsideWram(bg)) - { - if (mode != 0) - CpuCopy16(src, (void *)(sGpuBgConfigs2[bg].tilemap + (destOffset * 2)), mode); - else - LZ77UnCompWram(src, (void *)(sGpuBgConfigs2[bg].tilemap + (destOffset * 2))); - } + if (IsInvalidBg32(bg) || IsTileMapOutsideWram(bg)) + return; + if (mode != 0) + CpuCopy16(src, (void *)(sGpuBgConfigs2[bg].tilemap + (destOffset * 2)), mode); + else + LZ77UnCompWram(src, (void *)(sGpuBgConfigs2[bg].tilemap + (destOffset * 2))); } void CopyBgTilemapBufferToVram(u8 bg) { u16 sizeToLoad; - if (!IsInvalidBg32(bg) && !IsTileMapOutsideWram(bg)) + if (IsInvalidBg32(bg) || IsTileMapOutsideWram(bg)) + return; + + switch (GetBgType(bg)) { - switch (GetBgType(bg)) - { - case 0: - sizeToLoad = GetBgMetricTextMode(bg, 0) * 0x800; - break; - case 1: - sizeToLoad = GetBgMetricAffineMode(bg, 0) * 0x100; - break; - default: - sizeToLoad = 0; - break; - } - LoadBgVram(bg, sGpuBgConfigs2[bg].tilemap, sizeToLoad, 0, 2); + case 0: + sizeToLoad = GetBgMetricTextMode(bg, 0) * 0x800; + break; + case 1: + sizeToLoad = GetBgMetricAffineMode(bg, 0) * 0x100; + break; + default: + sizeToLoad = 0; + break; } + LoadBgVram(bg, sGpuBgConfigs2[bg].tilemap, sizeToLoad, 0, 2); } -void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height) +void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height) { - u16 destX16; - u16 destY16; + u16 destX16, destY16; u16 mode; - if (!IsInvalidBg32(bg) && !IsTileMapOutsideWram(bg)) + if (IsInvalidBg32(bg) || IsTileMapOutsideWram(bg)) + return; + switch (GetBgType(bg)) { - switch (GetBgType(bg)) + case 0: + { + const u16 *srcCopy = src; + for (destY16 = destY; destY16 < (destY + height); destY16++) { - case 0: - { - const u16 * srcCopy = src; - for (destY16 = destY; destY16 < (destY + height); destY16++) + for (destX16 = destX; destX16 < (destX + width); destX16++) { - for (destX16 = destX; destX16 < (destX + width); destX16++) - { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++; - } + ((u16 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++; } - break; } - case 1: + break; + } + case 1: + { + const u8 *srcCopy = src; + mode = GetBgMetricAffineMode(bg, 0x1); + for (destY16 = destY; destY16 < (destY + height); destY16++) { - const u8 * srcCopy = src; - mode = GetBgMetricAffineMode(bg, 0x1); - for (destY16 = destY; destY16 < (destY + height); destY16++) + for (destX16 = destX; destX16 < (destX + width); destX16++) { - for (destX16 = destX; destX16 < (destX + width); destX16++) - { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++; - } + ((u8 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++; } - break; - } } + break; + } } } diff --git a/gflib/text.c b/gflib/text.c index 636fe50a97..89b47ca219 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -154,7 +154,7 @@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 printerTemplate.currentY = y; printerTemplate.letterSpacing = gFonts[fontId].letterSpacing; printerTemplate.lineSpacing = gFonts[fontId].lineSpacing; - printerTemplate.unk = gFonts[fontId].unk; + printerTemplate.style = gFonts[fontId].style; printerTemplate.fgColor = gFonts[fontId].fgColor; printerTemplate.bgColor = gFonts[fontId].bgColor; printerTemplate.shadowColor = gFonts[fontId].shadowColor; @@ -462,35 +462,34 @@ u8 GetLastTextColor(u8 colorType) } } -#define GLYPH_COPY(fromY_, toY_, fromX_, toX_, unk) \ -{ \ - u32 i, j, *ptr, toY, fromX, toX, r5, bits; \ - u8 *dst; \ - j = fromX_; \ - i = fromY_; \ - ptr = unk; \ - toX = toX_; \ - toY = toY_; \ - fromX = fromX_; \ - \ - for (; i < toY; i++) \ - { \ - asm("":::"sl"); /* NONMATCHING */ \ - r5 = *(ptr++); \ - for (j = fromX; j < toX; j++) \ - { \ - const u32 toOrr = r5 & 0xF; \ - if (toOrr) \ - { \ - dst = windowTiles + ((j / 8) * 32) + ((j & 7) >> 1) + ((i / 8) * widthOffset) + ((i & 7) * 4); \ - bits = ((j & 1) * 4); \ - *dst = (toOrr << bits) | ((0xF0 >> bits) & *dst); \ - } \ - r5 >>= 4; \ - } \ - } \ -} - +#define GLYPH_COPY(fromY_, toY_, fromX_, toX_, unk) \ + { \ + u32 i, j, *ptr, toY, fromX, toX, r5, bits; \ + u8 *dst; \ + j = fromX_; \ + i = fromY_; \ + ptr = unk; \ + toX = toX_; \ + toY = toY_; \ + fromX = fromX_; \ + \ + for (; i < toY; i++) \ + { \ + asm("":::"sl"); /* NONMATCHING */ \ + r5 = *(ptr++); \ + for (j = fromX; j < toX; j++) \ + { \ + const u32 toOrr = r5 & 0xF; \ + if (toOrr) \ + { \ + dst = windowTiles + ((j / 8) * 32) + ((j % 8) / 2) + ((i / 8) * widthOffset) + ((i % 8) * 4); \ + bits = ((j & 1) * 4); \ + *dst = (toOrr << bits) | (*dst & (0xF0 >> bits)); \ + } \ + r5 >>= 4; \ + } \ + } \ + } void CopyGlyphToWindow(struct TextPrinter *textPrinter) { @@ -505,12 +504,12 @@ void CopyGlyphToWindow(struct TextPrinter *textPrinter) winTempl = &win->window; r4 = (winTempl->width * 8) - textPrinter->printerTemplate.currentX; - if (r4 > gUnknown_03002F90.unk80) - r4 = gUnknown_03002F90.unk80; + if (r4 > gUnknown_03002F90.width) + r4 = gUnknown_03002F90.width; r0 = (winTempl->height * 8) - textPrinter->printerTemplate.currentY; - if (r0 > gUnknown_03002F90.unk81) - r0 = gUnknown_03002F90.unk81; + if (r0 > gUnknown_03002F90.height) + r0 = gUnknown_03002F90.height; currX = textPrinter->printerTemplate.currentX; currY = textPrinter->printerTemplate.currentY; @@ -576,7 +575,7 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width) pixels_data.height = window->window.height << 3; gUnk = &gUnknown_03002F90; - glyphHeight = &gUnk->unk81; + glyphHeight = &gUnk->height; FillBitmapRect4Bit( &pixels_data, @@ -787,7 +786,7 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) else { TextPrinterDrawDownArrow(textPrinter); - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; PlaySE(SE_SELECT); @@ -803,7 +802,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter) { result = TextPrinterWaitAutoMode(textPrinter); } - else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + else if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; PlaySE(SE_SELECT); @@ -863,13 +862,13 @@ u16 RenderText(struct TextPrinter *textPrinter) switch (textPrinter->state) { case 0: - if ((gMain.heldKeys & (A_BUTTON | B_BUTTON)) && subStruct->hasPrintBeenSpedUp) + if ((JOY_HELD(A_BUTTON | B_BUTTON)) && subStruct->hasPrintBeenSpedUp) textPrinter->delayCounter = 0; if (textPrinter->delayCounter && textPrinter->textSpeed) { textPrinter->delayCounter--; - if (gTextFlags.canABSpeedUpPrint && (gMain.newKeys & (A_BUTTON | B_BUTTON))) + if (gTextFlags.canABSpeedUpPrint && (JOY_NEW(A_BUTTON | B_BUTTON))) { subStruct->hasPrintBeenSpedUp = TRUE; textPrinter->delayCounter = 0; @@ -1035,8 +1034,8 @@ u16 RenderText(struct TextPrinter *textPrinter) break; case CHAR_KEYPAD_ICON: currChar = *textPrinter->printerTemplate.currentChar++; - gUnknown_03002F90.unk80 = DrawKeypadIcon(textPrinter->printerTemplate.windowId, currChar, textPrinter->printerTemplate.currentX, textPrinter->printerTemplate.currentY); - textPrinter->printerTemplate.currentX += gUnknown_03002F90.unk80 + textPrinter->printerTemplate.letterSpacing; + gUnknown_03002F90.width = DrawKeypadIcon(textPrinter->printerTemplate.windowId, currChar, textPrinter->printerTemplate.currentX, textPrinter->printerTemplate.currentY); + textPrinter->printerTemplate.currentX += gUnknown_03002F90.width + textPrinter->printerTemplate.letterSpacing; return 0; case EOS: return 1; @@ -1070,8 +1069,8 @@ u16 RenderText(struct TextPrinter *textPrinter) if (textPrinter->minLetterSpacing) { - textPrinter->printerTemplate.currentX += gUnknown_03002F90.unk80; - width = textPrinter->minLetterSpacing - gUnknown_03002F90.unk80; + textPrinter->printerTemplate.currentX += gUnknown_03002F90.width; + width = textPrinter->minLetterSpacing - gUnknown_03002F90.width; if (width > 0) { ClearTextSpan(textPrinter, width); @@ -1079,9 +1078,9 @@ u16 RenderText(struct TextPrinter *textPrinter) } } else if (textPrinter->japanese) - textPrinter->printerTemplate.currentX += (gUnknown_03002F90.unk80 + textPrinter->printerTemplate.letterSpacing); + textPrinter->printerTemplate.currentX += (gUnknown_03002F90.width + textPrinter->printerTemplate.letterSpacing); else - textPrinter->printerTemplate.currentX += gUnknown_03002F90.unk80; + textPrinter->printerTemplate.currentX += gUnknown_03002F90.width; return 0; case 1: if (TextPrinterWait(textPrinter)) @@ -1567,7 +1566,7 @@ void SetDefaultFontsPointer(void) u8 GetFontAttribute(u8 fontId, u8 attributeId) { - int result = 0; + u8 result = 0; switch (attributeId) { case FONTATTR_MAX_LETTER_WIDTH: @@ -1582,8 +1581,8 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId) case FONTATTR_LINE_SPACING: result = gFontInfos[fontId].lineSpacing; break; - case FONTATTR_UNKNOWN: - result = gFontInfos[fontId].unk; + case FONTATTR_STYLE: + result = gFontInfos[fontId].style; break; case FONTATTR_COLOR_FOREGROUND: result = gFontInfos[fontId].fgColor; @@ -1612,15 +1611,15 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40 - gUnknown_03002F90.unk80 = 8; // gGlyphWidth - gUnknown_03002F90.unk81 = 12; // gGlyphHeight + gUnknown_03002F90.width = 8; // gGlyphWidth + gUnknown_03002F90.height = 12; // gGlyphHeight } else { glyphs = gFont0LatinGlyphs + (0x20 * glyphId); - gUnknown_03002F90.unk80 = gFont0LatinGlyphWidths[glyphId]; + gUnknown_03002F90.width = gFont0LatinGlyphWidths[glyphId]; - if (gUnknown_03002F90.unk80 <= 8) + if (gUnknown_03002F90.width <= 8) { DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40); @@ -1633,7 +1632,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60); } - gUnknown_03002F90.unk81 = 13; + gUnknown_03002F90.height = 13; } } @@ -1655,15 +1654,15 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese) glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40 - gUnknown_03002F90.unk80 = 8; // gGlyphWidth - gUnknown_03002F90.unk81 = 15; // gGlyphHeight + gUnknown_03002F90.width = 8; // gGlyphWidth + gUnknown_03002F90.height = 15; // gGlyphHeight } else { glyphs = gFont7LatinGlyphs + (0x20 * glyphId); - gUnknown_03002F90.unk80 = gFont7LatinGlyphWidths[glyphId]; + gUnknown_03002F90.width = gFont7LatinGlyphWidths[glyphId]; - if (gUnknown_03002F90.unk80 <= 8) + if (gUnknown_03002F90.width <= 8) { DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40); @@ -1676,7 +1675,7 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese) DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60); } - gUnknown_03002F90.unk81 = 15; + gUnknown_03002F90.height = 15; } } @@ -1697,15 +1696,15 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese) glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40 - gUnknown_03002F90.unk80 = 8; // gGlyphWidth - gUnknown_03002F90.unk81 = 12; // gGlyphHeight + gUnknown_03002F90.width = 8; // gGlyphWidth + gUnknown_03002F90.height = 12; // gGlyphHeight } else { glyphs = gFont8LatinGlyphs + (0x20 * glyphId); - gUnknown_03002F90.unk80 = gFont8LatinGlyphWidths[glyphId]; + gUnknown_03002F90.width = gFont8LatinGlyphWidths[glyphId]; - if (gUnknown_03002F90.unk80 <= 8) + if (gUnknown_03002F90.width <= 8) { DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40); @@ -1718,7 +1717,7 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese) DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60); } - gUnknown_03002F90.unk81 = 12; + gUnknown_03002F90.height = 12; } } @@ -1738,18 +1737,18 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) { glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); - DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20); // gUnknown_03002F90 + 0x40 - DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x20 - DecompressGlyphTile(glyphs + 0x88, gUnknown_03002F90.unk60); // gUnknown_03002F90 + 0x60 - gUnknown_03002F90.unk80 = gFont2JapaneseGlyphWidths[glyphId]; // gGlyphWidth - gUnknown_03002F90.unk81 = 14; // gGlyphHeight + DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20); + DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); + DecompressGlyphTile(glyphs + 0x88, gUnknown_03002F90.unk60); + gUnknown_03002F90.width = gFont2JapaneseGlyphWidths[glyphId]; // gGlyphWidth + gUnknown_03002F90.height = 14; // gGlyphHeight } else { glyphs = gFont2LatinGlyphs + (0x20 * glyphId); - gUnknown_03002F90.unk80 = gFont2LatinGlyphWidths[glyphId]; + gUnknown_03002F90.width = gFont2LatinGlyphWidths[glyphId]; - if (gUnknown_03002F90.unk80 <= 8) + if (gUnknown_03002F90.width <= 8) { DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40); @@ -1762,7 +1761,7 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60); } - gUnknown_03002F90.unk81 = 14; + gUnknown_03002F90.height = 14; } } @@ -1784,15 +1783,15 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); // gUnknown_03002F90 + 0x40 - gUnknown_03002F90.unk80 = 8; // gGlyphWidth - gUnknown_03002F90.unk81 = 15; // gGlyphHeight + gUnknown_03002F90.width = 8; // gGlyphWidth + gUnknown_03002F90.height = 15; // gGlyphHeight } else { glyphs = gFont1LatinGlyphs + (0x20 * glyphId); - gUnknown_03002F90.unk80 = gFont1LatinGlyphWidths[glyphId]; + gUnknown_03002F90.width = gFont1LatinGlyphWidths[glyphId]; - if (gUnknown_03002F90.unk80 <= 8) + if (gUnknown_03002F90.width <= 8) { DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40); @@ -1805,7 +1804,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60); } - gUnknown_03002F90.unk81 = 15; + gUnknown_03002F90.height = 15; } } @@ -1824,6 +1823,6 @@ void DecompressGlyphFont9(u16 glyphId) glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0); DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40); - gUnknown_03002F90.unk80 = 8; - gUnknown_03002F90.unk81 = 12; + gUnknown_03002F90.width = 8; + gUnknown_03002F90.height = 12; } diff --git a/gflib/text.h b/gflib/text.h index 0829d748f3..4cf5bc20b9 100644 --- a/gflib/text.h +++ b/gflib/text.h @@ -282,7 +282,7 @@ enum FONTATTR_MAX_LETTER_HEIGHT, FONTATTR_LETTER_SPACING, FONTATTR_LINE_SPACING, - FONTATTR_UNKNOWN, // dunno what this is yet + FONTATTR_STYLE, FONTATTR_COLOR_FOREGROUND, FONTATTR_COLOR_BACKGROUND, FONTATTR_COLOR_SHADOW @@ -310,7 +310,7 @@ struct TextPrinterTemplate u8 currentY; u8 letterSpacing; u8 lineSpacing; - u8 unk:4; // 0xC + u8 style:4; // 0xC u8 fgColor:4; u8 bgColor:4; u8 shadowColor:4; @@ -339,7 +339,7 @@ struct FontInfo u8 maxLetterHeight; u8 letterSpacing; u8 lineSpacing; - u8 unk:4; + u8 style:4; //unused u8 fgColor:4; u8 bgColor:4; u8 shadowColor:4; @@ -373,8 +373,8 @@ struct Struct_03002F90 u32 unk20[8]; u32 unk40[8]; u32 unk60[8]; - u8 unk80; - u8 unk81; + u8 width; + u8 height; }; extern TextFlags gTextFlags; diff --git a/gflib/window.c b/gflib/window.c index 7c87ea86dc..0be59773c1 100644 --- a/gflib/window.c +++ b/gflib/window.c @@ -30,21 +30,18 @@ static void nullsub_8(void) bool16 InitWindows(const struct WindowTemplate *templates) { - int i; - void *bgTilemapBuffer; - int j; - u8 bgLayer; - u16 attrib; + int i, j; u8* allocatedTilemapBuffer; + u16 attrib; int allocatedBaseBlock; + u8 bgLayer; for (i = 0; i < 0x4; ++i) { - bgTilemapBuffer = GetBgTilemapBuffer(i); - if (bgTilemapBuffer != NULL) + if (GetBgTilemapBuffer(i) != NULL) gUnknown_03002F70[i] = nullsub_8; else - gUnknown_03002F70[i] = bgTilemapBuffer; + gUnknown_03002F70[i] = NULL; } for (i = 0; i < 0x20; ++i) @@ -567,19 +564,19 @@ u32 GetWindowAttribute(u8 windowId, u8 attributeId) switch (attributeId) { case WINDOW_BG: - return gWindows[windowId].window.bg; + return (u32)gWindows[windowId].window.bg; case WINDOW_TILEMAP_LEFT: - return gWindows[windowId].window.tilemapLeft; + return (u32)gWindows[windowId].window.tilemapLeft; case WINDOW_TILEMAP_TOP: - return gWindows[windowId].window.tilemapTop; + return (u32)gWindows[windowId].window.tilemapTop; case WINDOW_WIDTH: - return gWindows[windowId].window.width; + return (u32)gWindows[windowId].window.width; case WINDOW_HEIGHT: - return gWindows[windowId].window.height; + return (u32)gWindows[windowId].window.height; case WINDOW_PALETTE_NUM: - return gWindows[windowId].window.paletteNum; + return (u32)gWindows[windowId].window.paletteNum; case WINDOW_BASE_BLOCK: - return gWindows[windowId].window.baseBlock; + return (u32)gWindows[windowId].window.baseBlock; case WINDOW_TILE_DATA: return (u32)(gWindows[windowId].tileData); default: @@ -643,12 +640,9 @@ u16 AddWindow8Bit(const struct WindowTemplate *template) } return 0xFF; } - else - { - gWindows[windowId].tileData = memAddress; - gWindows[windowId].window = *template; - return windowId; - } + gWindows[windowId].tileData = memAddress; + gWindows[windowId].window = *template; + return windowId; } void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue) diff --git a/graphics/berry_blender/marubatsu.png b/graphics/berry_blender/score_symbols.png similarity index 100% rename from graphics/berry_blender/marubatsu.png rename to graphics/berry_blender/score_symbols.png diff --git a/graphics/unknown/unknown_339514.pal b/graphics/berry_blender/unused.pal similarity index 100% rename from graphics/unknown/unknown_339514.pal rename to graphics/berry_blender/unused.pal diff --git a/graphics/misc/cable_car_bg.pal b/graphics/cable_car/bg.pal similarity index 100% rename from graphics/misc/cable_car_bg.pal rename to graphics/cable_car/bg.pal diff --git a/graphics/misc/cable_car_bg.png b/graphics/cable_car/bg.png similarity index 100% rename from graphics/misc/cable_car_bg.png rename to graphics/cable_car/bg.png diff --git a/graphics/misc/cable_car_mountain_map.bin b/graphics/cable_car/bg_mountains.bin similarity index 100% rename from graphics/misc/cable_car_mountain_map.bin rename to graphics/cable_car/bg_mountains.bin diff --git a/graphics/misc/cable_car_cord.png b/graphics/cable_car/cable.png similarity index 100% rename from graphics/misc/cable_car_cord.png rename to graphics/cable_car/cable.png diff --git a/graphics/misc/cable_car.png b/graphics/cable_car/cable_car.png similarity index 100% rename from graphics/misc/cable_car.png rename to graphics/cable_car/cable_car.png diff --git a/graphics/misc/cable_car_door.png b/graphics/cable_car/door.png similarity index 100% rename from graphics/misc/cable_car_door.png rename to graphics/cable_car/door.png diff --git a/graphics/misc/cable_car_mt_chimney_map.bin b/graphics/cable_car/ground.bin similarity index 100% rename from graphics/misc/cable_car_mt_chimney_map.bin rename to graphics/cable_car/ground.bin diff --git a/graphics/misc/cable_car_pylon_stem_map.bin b/graphics/cable_car/pylons.bin similarity index 100% rename from graphics/misc/cable_car_pylon_stem_map.bin rename to graphics/cable_car/pylons.bin diff --git a/graphics/misc/cable_car_tree_map.bin b/graphics/cable_car/trees.bin similarity index 100% rename from graphics/misc/cable_car_tree_map.bin rename to graphics/cable_car/trees.bin diff --git a/graphics/rayquaza_scene/kyogre.png b/graphics/rayquaza_scene/kyogre.png deleted file mode 100644 index 0f2e27e4e2..0000000000 Binary files a/graphics/rayquaza_scene/kyogre.png and /dev/null differ diff --git a/graphics/rayquaza_scene/clouds.pal b/graphics/rayquaza_scene/scene_1/clouds.pal similarity index 100% rename from graphics/rayquaza_scene/clouds.pal rename to graphics/rayquaza_scene/scene_1/clouds.pal diff --git a/graphics/rayquaza_scene/clouds.png b/graphics/rayquaza_scene/scene_1/clouds.png similarity index 100% rename from graphics/rayquaza_scene/clouds.png rename to graphics/rayquaza_scene/scene_1/clouds.png diff --git a/graphics/rayquaza_scene/clouds1.bin b/graphics/rayquaza_scene/scene_1/clouds1.bin similarity index 100% rename from graphics/rayquaza_scene/clouds1.bin rename to graphics/rayquaza_scene/scene_1/clouds1.bin diff --git a/graphics/rayquaza_scene/clouds2.bin b/graphics/rayquaza_scene/scene_1/clouds2.bin similarity index 100% rename from graphics/rayquaza_scene/clouds2.bin rename to graphics/rayquaza_scene/scene_1/clouds2.bin diff --git a/graphics/rayquaza_scene/clouds3.bin b/graphics/rayquaza_scene/scene_1/clouds3.bin similarity index 100% rename from graphics/rayquaza_scene/clouds3.bin rename to graphics/rayquaza_scene/scene_1/clouds3.bin diff --git a/graphics/rayquaza_scene/groudon.png b/graphics/rayquaza_scene/scene_1/groudon.png similarity index 100% rename from graphics/rayquaza_scene/groudon.png rename to graphics/rayquaza_scene/scene_1/groudon.png diff --git a/graphics/rayquaza_scene/groudon_claw.png b/graphics/rayquaza_scene/scene_1/groudon_claw.png similarity index 100% rename from graphics/rayquaza_scene/groudon_claw.png rename to graphics/rayquaza_scene/scene_1/groudon_claw.png diff --git a/graphics/rayquaza_scene/groudon_shoulder.png b/graphics/rayquaza_scene/scene_1/groudon_shoulder.png similarity index 100% rename from graphics/rayquaza_scene/groudon_shoulder.png rename to graphics/rayquaza_scene/scene_1/groudon_shoulder.png diff --git a/graphics/rayquaza_scene/scene_1/kyogre.png b/graphics/rayquaza_scene/scene_1/kyogre.png new file mode 100644 index 0000000000..7ed02a134b Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/kyogre.png differ diff --git a/graphics/rayquaza_scene/kyogre_fin.png b/graphics/rayquaza_scene/scene_1/kyogre_dorsal_fin.png similarity index 100% rename from graphics/rayquaza_scene/kyogre_fin.png rename to graphics/rayquaza_scene/scene_1/kyogre_dorsal_fin.png diff --git a/graphics/rayquaza_scene/kyogre_shoulder.png b/graphics/rayquaza_scene/scene_1/kyogre_pectoral_fin.png similarity index 100% rename from graphics/rayquaza_scene/kyogre_shoulder.png rename to graphics/rayquaza_scene/scene_1/kyogre_pectoral_fin.png diff --git a/graphics/rayquaza_scene/overcast.bin b/graphics/rayquaza_scene/scene_2/bg.bin similarity index 100% rename from graphics/rayquaza_scene/overcast.bin rename to graphics/rayquaza_scene/scene_2/bg.bin diff --git a/graphics/rayquaza_scene/overcast.png b/graphics/rayquaza_scene/scene_2/bg.png similarity index 100% rename from graphics/rayquaza_scene/overcast.png rename to graphics/rayquaza_scene/scene_2/bg.png diff --git a/graphics/rayquaza_scene/rayquaza.bin b/graphics/rayquaza_scene/scene_2/rayquaza.bin similarity index 100% rename from graphics/rayquaza_scene/rayquaza.bin rename to graphics/rayquaza_scene/scene_2/rayquaza.bin diff --git a/graphics/rayquaza_scene/rayquaza.png b/graphics/rayquaza_scene/scene_2/rayquaza.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza.png rename to graphics/rayquaza_scene/scene_2/rayquaza.png diff --git a/graphics/rayquaza_scene/smoke.png b/graphics/rayquaza_scene/scene_2/smoke.png similarity index 100% rename from graphics/rayquaza_scene/smoke.png rename to graphics/rayquaza_scene/scene_2/smoke.png diff --git a/graphics/rayquaza_scene/overcast2.bin b/graphics/rayquaza_scene/scene_3/bg.bin similarity index 100% rename from graphics/rayquaza_scene/overcast2.bin rename to graphics/rayquaza_scene/scene_3/bg.bin diff --git a/graphics/rayquaza_scene/overcast2.pal b/graphics/rayquaza_scene/scene_3/bg.pal similarity index 100% rename from graphics/rayquaza_scene/overcast2.pal rename to graphics/rayquaza_scene/scene_3/bg.pal diff --git a/graphics/rayquaza_scene/overcast2.png b/graphics/rayquaza_scene/scene_3/bg.png similarity index 100% rename from graphics/rayquaza_scene/overcast2.png rename to graphics/rayquaza_scene/scene_3/bg.png diff --git a/graphics/rayquaza_scene/rayquaza_light.bin b/graphics/rayquaza_scene/scene_3/light.bin similarity index 100% rename from graphics/rayquaza_scene/rayquaza_light.bin rename to graphics/rayquaza_scene/scene_3/light.bin diff --git a/graphics/rayquaza_scene/rayquaza_light.png b/graphics/rayquaza_scene/scene_3/light.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_light.png rename to graphics/rayquaza_scene/scene_3/light.png diff --git a/graphics/rayquaza_scene/rayquaza_fly1.png b/graphics/rayquaza_scene/scene_3/rayquaza.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_fly1.png rename to graphics/rayquaza_scene/scene_3/rayquaza.png diff --git a/graphics/rayquaza_scene/rayquaza_tail.png b/graphics/rayquaza_scene/scene_3/rayquaza_tail.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_tail.png rename to graphics/rayquaza_scene/scene_3/rayquaza_tail.png diff --git a/graphics/rayquaza_scene/chase_bg.bin b/graphics/rayquaza_scene/scene_4/bg.bin similarity index 100% rename from graphics/rayquaza_scene/chase_bg.bin rename to graphics/rayquaza_scene/scene_4/bg.bin diff --git a/graphics/rayquaza_scene/chase.pal b/graphics/rayquaza_scene/scene_4/bg.pal similarity index 100% rename from graphics/rayquaza_scene/chase.pal rename to graphics/rayquaza_scene/scene_4/bg.pal diff --git a/graphics/rayquaza_scene/chase_bg.png b/graphics/rayquaza_scene/scene_4/bg.png similarity index 100% rename from graphics/rayquaza_scene/chase_bg.png rename to graphics/rayquaza_scene/scene_4/bg.png diff --git a/graphics/rayquaza_scene/rayquaza_chase2.bin b/graphics/rayquaza_scene/scene_4/orbs.bin similarity index 100% rename from graphics/rayquaza_scene/rayquaza_chase2.bin rename to graphics/rayquaza_scene/scene_4/orbs.bin diff --git a/graphics/rayquaza_scene/rayquaza_chase.bin b/graphics/rayquaza_scene/scene_4/rayquaza.bin similarity index 100% rename from graphics/rayquaza_scene/rayquaza_chase.bin rename to graphics/rayquaza_scene/scene_4/rayquaza.bin diff --git a/graphics/rayquaza_scene/rayquaza_chase.png b/graphics/rayquaza_scene/scene_4/rayquaza.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_chase.png rename to graphics/rayquaza_scene/scene_4/rayquaza.png diff --git a/graphics/rayquaza_scene/chase_streaks.bin b/graphics/rayquaza_scene/scene_4/streaks.bin similarity index 100% rename from graphics/rayquaza_scene/chase_streaks.bin rename to graphics/rayquaza_scene/scene_4/streaks.bin diff --git a/graphics/rayquaza_scene/chase_streaks.png b/graphics/rayquaza_scene/scene_4/streaks.png similarity index 100% rename from graphics/rayquaza_scene/chase_streaks.png rename to graphics/rayquaza_scene/scene_4/streaks.png diff --git a/graphics/rayquaza_scene/hush_ring.bin b/graphics/rayquaza_scene/scene_5/bg.bin similarity index 100% rename from graphics/rayquaza_scene/hush_ring.bin rename to graphics/rayquaza_scene/scene_5/bg.bin diff --git a/graphics/rayquaza_scene/hush_bg.pal b/graphics/rayquaza_scene/scene_5/bg.pal similarity index 100% rename from graphics/rayquaza_scene/hush_bg.pal rename to graphics/rayquaza_scene/scene_5/bg.pal diff --git a/graphics/rayquaza_scene/groudon_left.png b/graphics/rayquaza_scene/scene_5/groudon.png similarity index 100% rename from graphics/rayquaza_scene/groudon_left.png rename to graphics/rayquaza_scene/scene_5/groudon.png diff --git a/graphics/rayquaza_scene/groudon_tail.png b/graphics/rayquaza_scene/scene_5/groudon_tail.png similarity index 100% rename from graphics/rayquaza_scene/groudon_tail.png rename to graphics/rayquaza_scene/scene_5/groudon_tail.png diff --git a/graphics/rayquaza_scene/kyogre_right.png b/graphics/rayquaza_scene/scene_5/kyogre.png similarity index 100% rename from graphics/rayquaza_scene/kyogre_right.png rename to graphics/rayquaza_scene/scene_5/kyogre.png diff --git a/graphics/rayquaza_scene/splash.png b/graphics/rayquaza_scene/scene_5/kyogre_splash.png similarity index 100% rename from graphics/rayquaza_scene/splash.png rename to graphics/rayquaza_scene/scene_5/kyogre_splash.png diff --git a/graphics/rayquaza_scene/hush_bg.bin b/graphics/rayquaza_scene/scene_5/light.bin similarity index 100% rename from graphics/rayquaza_scene/hush_bg.bin rename to graphics/rayquaza_scene/scene_5/light.bin diff --git a/graphics/rayquaza_scene/hush_bg.png b/graphics/rayquaza_scene/scene_5/light.png similarity index 100% rename from graphics/rayquaza_scene/hush_bg.png rename to graphics/rayquaza_scene/scene_5/light.png diff --git a/graphics/rayquaza_scene/rayquaza_hover.png b/graphics/rayquaza_scene/scene_5/rayquaza.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_hover.png rename to graphics/rayquaza_scene/scene_5/rayquaza.png diff --git a/graphics/rayquaza_scene/rayquaza_flyin.png b/graphics/rayquaza_scene/scene_5/rayquaza_tail.png similarity index 100% rename from graphics/rayquaza_scene/rayquaza_flyin.png rename to graphics/rayquaza_scene/scene_5/rayquaza_tail.png diff --git a/graphics/rayquaza_scene/hush_ring_map.bin b/graphics/rayquaza_scene/scene_5/ring.bin similarity index 100% rename from graphics/rayquaza_scene/hush_ring_map.bin rename to graphics/rayquaza_scene/scene_5/ring.bin diff --git a/graphics/rayquaza_scene/hush_ring.png b/graphics/rayquaza_scene/scene_5/ring.png similarity index 100% rename from graphics/rayquaza_scene/hush_ring.png rename to graphics/rayquaza_scene/scene_5/ring.png diff --git a/graphics/interface/wallclock.png b/graphics/wallclock/clock.png similarity index 100% rename from graphics/interface/wallclock.png rename to graphics/wallclock/clock.png diff --git a/graphics/interface/wallclock1.bin b/graphics/wallclock/clock_start.bin similarity index 100% rename from graphics/interface/wallclock1.bin rename to graphics/wallclock/clock_start.bin diff --git a/graphics/interface/wallclock2.bin b/graphics/wallclock/clock_view.bin similarity index 100% rename from graphics/interface/wallclock2.bin rename to graphics/wallclock/clock_view.bin diff --git a/graphics/interface/wallclock_female.pal b/graphics/wallclock/female.pal similarity index 100% rename from graphics/interface/wallclock_female.pal rename to graphics/wallclock/female.pal diff --git a/graphics/wallclock/graphics_85b1f58.png b/graphics/wallclock/hand.png similarity index 100% rename from graphics/wallclock/graphics_85b1f58.png rename to graphics/wallclock/hand.png diff --git a/graphics/interface/wallclock_male.pal b/graphics/wallclock/male.pal similarity index 100% rename from graphics/interface/wallclock_male.pal rename to graphics/wallclock/male.pal diff --git a/graphics/wallclock/palette_85b21d4.pal b/graphics/wallclock/text_prompt.pal similarity index 100% rename from graphics/wallclock/palette_85b21d4.pal rename to graphics/wallclock/text_prompt.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index a5f407d587..a88f14954a 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -475,23 +475,23 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png diff --git a/include/battle.h b/include/battle.h index 78e7b809a2..5a04c1eec6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -523,14 +523,14 @@ struct BattleAnimationInfo u8 field_7; u8 ballThrowCaseId; u8 field_9_x1:1; - u8 field_9_x2:1; + u8 wildMonInvisible:1; u8 field_9_x1C:3; u8 field_9_x20:1; u8 field_9_x40:1; u8 field_9_x80:1; - u8 field_A; + u8 numBallParticles; u8 field_B; - s16 field_C; + s16 ballSubpx; u8 field_E; u8 field_F; }; @@ -544,8 +544,8 @@ struct BattleHealthboxInfo u8 statusAnimActive:1; // x10 u8 animFromTableActive:1; // x20 u8 specialAnimActive:1; // x40 - u8 flag_x80:1; - u8 field_1_x1:1; + u8 triedShinyMonAnim:1; + u8 finishedShinyMonAnim:1; u8 field_1_x1E:4; u8 field_1_x20:1; u8 field_1_x40:1; diff --git a/include/battle_anim.h b/include/battle_anim.h index 18727cc732..096d533e25 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -207,8 +207,8 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); // battle_anim_ground.c void AnimTask_HorizontalShake(u8 taskId); -// battle_anim_special.c -void sub_8172EF0(u8 battler, struct Pokemon *mon); +// battle_anim_throw.c +void TryShinyAnimation(u8 battler, struct Pokemon *mon); u8 ItemIdToBallId(u16 itemId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId); diff --git a/include/battle_main.h b/include/battle_main.h index 217b10b391..890e47f399 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -67,7 +67,7 @@ void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d); void EndBounceEffect(u8 battlerId, bool8 b); void SpriteCb_PlayerMonFromBall(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); -void sub_8039E84(struct Sprite *sprite); +void SpriteCB_TrainerThrowObject(struct Sprite *sprite); void sub_8039E9C(struct Sprite *sprite); void nullsub_20(void); void BeginBattleIntro(void); diff --git a/include/berry_blender.h b/include/berry_blender.h index e8f7bb83dd..66d8393890 100644 --- a/include/berry_blender.h +++ b/include/berry_blender.h @@ -1,6 +1,16 @@ #ifndef GUARD_BERRY_BLENDER_H #define GUARD_BERRY_BLENDER_H +// Indices into gSendCmd / gRecvCmds +#define BLENDER_COMM_INPUT_STATE 0 +#define BLENDER_COMM_RESP 1 +#define BLENDER_COMM_SCORE 2 +#define BLENDER_COMM_STOP_TYPE 2 // re-used +#define BLENDER_COMM_PLAYER_ID 3 +#define BLENDER_COMM_UNUSED 4 +#define BLENDER_COMM_PROGRESS_BAR 5 +#define BLENDER_COMM_ARROW_POS 6 + extern u8 gInGameOpponentsNo; void DoBerryBlending(void); diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index dfdd9f9120..ebc422b18e 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -376,7 +376,7 @@ #define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 #define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 #define B_ANIM_BALL_THROW 0x3 -#define B_ANIM_SAFARI_BALL_THROW 0x4 +#define B_ANIM_BALL_THROW_WITH_TRAINER 0x4 #define B_ANIM_SUBSTITUTE_TO_MON 0x5 #define B_ANIM_MON_TO_SUBSTITUTE 0x6 diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h index 004df71552..378197a4df 100644 --- a/include/constants/battle_pyramid.h +++ b/include/constants/battle_pyramid.h @@ -7,16 +7,6 @@ #define FLOOR_WALKABLE_METATILE 0x28D #define FLOOR_EXIT_METATILE 0x28E -#define HINT_EXIT_DIRECTION 0 -#define HINT_REMAINING_ITEMS 1 -#define HINT_REMAINING_TRAINERS 2 -#define HINT_EXIT_SHORT_REMAINING_TRAINERS 3 -#define HINT_EXIT_SHORT_REMAINING_ITEMS 4 -#define HINT_EXIT_MEDIUM_REMAINING_TRAINERS 5 -#define HINT_EXIT_MEDIUM_REMAINING_ITEMS 6 -#define HINT_EXIT_FAR_REMAINING_TRAINERS 7 -#define HINT_EXIT_FAR_REMAINING_ITEMS 8 - #define OBJ_TRAINERS 0 #define OBJ_ITEMS 1 diff --git a/include/constants/daycare.h b/include/constants/daycare.h index 103f920f29..adb62fab50 100644 --- a/include/constants/daycare.h +++ b/include/constants/daycare.h @@ -22,6 +22,6 @@ // Array buffers #define EGG_MOVES_ARRAY_COUNT 10 -#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 +#define EGG_LVL_UP_MOVES_ARRAY_COUNT (MAX_LEVEL_UP_MOVES > 50 ? MAX_LEVEL_UP_MOVES : 50) #endif //GUARD_DAYCARE_CONSTANTS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 2490a6244f..a562b0670e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -538,27 +538,27 @@ // Hidden Items -- sorted by location #define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0B) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24) -#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18) -#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19) -#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0B) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24) +#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON (FLAG_HIDDEN_ITEMS_START + 0x13) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14) +#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C) +#define FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15) +#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16) +#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17) +#define FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18) +#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19) +#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) #define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x1C) #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F) diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 500b82cd47..9d5e877b05 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -55,9 +55,9 @@ #define LAYOUT_ROUTE132 48 #define LAYOUT_ROUTE133 49 #define LAYOUT_ROUTE134 50 -#define LAYOUT_UNDERWATER2 51 -#define LAYOUT_UNDERWATER3 52 -#define LAYOUT_UNDERWATER4 53 +#define LAYOUT_UNDERWATER_ROUTE126 51 +#define LAYOUT_UNDERWATER_ROUTE127 52 +#define LAYOUT_UNDERWATER_ROUTE128 53 #define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54 #define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55 #define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56 @@ -278,7 +278,7 @@ #define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271 #define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272 #define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273 -#define LAYOUT_UNDERWATER1 274 +#define LAYOUT_UNDERWATER_ROUTE124 274 #define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275 #define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276 #define LAYOUT_SS_TIDAL_CORRIDOR 277 @@ -414,9 +414,9 @@ #define LAYOUT_MARINE_CAVE_ENTRANCE 407 #define LAYOUT_TERRA_CAVE_ENTRANCE 408 #define LAYOUT_TERRA_CAVE_END 409 -#define LAYOUT_UNDERWATER6 410 -#define LAYOUT_UNDERWATER7 411 -#define LAYOUT_UNDERWATER5 412 +#define LAYOUT_UNDERWATER_ROUTE105 410 +#define LAYOUT_UNDERWATER_ROUTE125 411 +#define LAYOUT_UNDERWATER_ROUTE129 412 #define LAYOUT_MARINE_CAVE_END 413 #define LAYOUT_TRAINER_HILL_ENTRANCE 414 #define LAYOUT_TRAINER_HILL_1F 415 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index aef9924fac..69355635b3 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -6,63 +6,63 @@ // // Map Group 0 -#define MAP_PETALBURG_CITY (0 | (0 << 8)) -#define MAP_SLATEPORT_CITY (1 | (0 << 8)) -#define MAP_MAUVILLE_CITY (2 | (0 << 8)) -#define MAP_RUSTBORO_CITY (3 | (0 << 8)) -#define MAP_FORTREE_CITY (4 | (0 << 8)) -#define MAP_LILYCOVE_CITY (5 | (0 << 8)) -#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) -#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) -#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) -#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) -#define MAP_OLDALE_TOWN (10 | (0 << 8)) -#define MAP_DEWFORD_TOWN (11 | (0 << 8)) -#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) -#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) -#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) -#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) -#define MAP_ROUTE101 (16 | (0 << 8)) -#define MAP_ROUTE102 (17 | (0 << 8)) -#define MAP_ROUTE103 (18 | (0 << 8)) -#define MAP_ROUTE104 (19 | (0 << 8)) -#define MAP_ROUTE105 (20 | (0 << 8)) -#define MAP_ROUTE106 (21 | (0 << 8)) -#define MAP_ROUTE107 (22 | (0 << 8)) -#define MAP_ROUTE108 (23 | (0 << 8)) -#define MAP_ROUTE109 (24 | (0 << 8)) -#define MAP_ROUTE110 (25 | (0 << 8)) -#define MAP_ROUTE111 (26 | (0 << 8)) -#define MAP_ROUTE112 (27 | (0 << 8)) -#define MAP_ROUTE113 (28 | (0 << 8)) -#define MAP_ROUTE114 (29 | (0 << 8)) -#define MAP_ROUTE115 (30 | (0 << 8)) -#define MAP_ROUTE116 (31 | (0 << 8)) -#define MAP_ROUTE117 (32 | (0 << 8)) -#define MAP_ROUTE118 (33 | (0 << 8)) -#define MAP_ROUTE119 (34 | (0 << 8)) -#define MAP_ROUTE120 (35 | (0 << 8)) -#define MAP_ROUTE121 (36 | (0 << 8)) -#define MAP_ROUTE122 (37 | (0 << 8)) -#define MAP_ROUTE123 (38 | (0 << 8)) -#define MAP_ROUTE124 (39 | (0 << 8)) -#define MAP_ROUTE125 (40 | (0 << 8)) -#define MAP_ROUTE126 (41 | (0 << 8)) -#define MAP_ROUTE127 (42 | (0 << 8)) -#define MAP_ROUTE128 (43 | (0 << 8)) -#define MAP_ROUTE129 (44 | (0 << 8)) -#define MAP_ROUTE130 (45 | (0 << 8)) -#define MAP_ROUTE131 (46 | (0 << 8)) -#define MAP_ROUTE132 (47 | (0 << 8)) -#define MAP_ROUTE133 (48 | (0 << 8)) -#define MAP_ROUTE134 (49 | (0 << 8)) -#define MAP_UNDERWATER1 (50 | (0 << 8)) -#define MAP_UNDERWATER2 (51 | (0 << 8)) -#define MAP_UNDERWATER3 (52 | (0 << 8)) -#define MAP_UNDERWATER4 (53 | (0 << 8)) -#define MAP_UNDERWATER5 (54 | (0 << 8)) -#define MAP_UNDERWATER6 (55 | (0 << 8)) -#define MAP_UNDERWATER7 (56 | (0 << 8)) +#define MAP_PETALBURG_CITY (0 | (0 << 8)) +#define MAP_SLATEPORT_CITY (1 | (0 << 8)) +#define MAP_MAUVILLE_CITY (2 | (0 << 8)) +#define MAP_RUSTBORO_CITY (3 | (0 << 8)) +#define MAP_FORTREE_CITY (4 | (0 << 8)) +#define MAP_LILYCOVE_CITY (5 | (0 << 8)) +#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) +#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) +#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) +#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) +#define MAP_OLDALE_TOWN (10 | (0 << 8)) +#define MAP_DEWFORD_TOWN (11 | (0 << 8)) +#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) +#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) +#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) +#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) +#define MAP_ROUTE101 (16 | (0 << 8)) +#define MAP_ROUTE102 (17 | (0 << 8)) +#define MAP_ROUTE103 (18 | (0 << 8)) +#define MAP_ROUTE104 (19 | (0 << 8)) +#define MAP_ROUTE105 (20 | (0 << 8)) +#define MAP_ROUTE106 (21 | (0 << 8)) +#define MAP_ROUTE107 (22 | (0 << 8)) +#define MAP_ROUTE108 (23 | (0 << 8)) +#define MAP_ROUTE109 (24 | (0 << 8)) +#define MAP_ROUTE110 (25 | (0 << 8)) +#define MAP_ROUTE111 (26 | (0 << 8)) +#define MAP_ROUTE112 (27 | (0 << 8)) +#define MAP_ROUTE113 (28 | (0 << 8)) +#define MAP_ROUTE114 (29 | (0 << 8)) +#define MAP_ROUTE115 (30 | (0 << 8)) +#define MAP_ROUTE116 (31 | (0 << 8)) +#define MAP_ROUTE117 (32 | (0 << 8)) +#define MAP_ROUTE118 (33 | (0 << 8)) +#define MAP_ROUTE119 (34 | (0 << 8)) +#define MAP_ROUTE120 (35 | (0 << 8)) +#define MAP_ROUTE121 (36 | (0 << 8)) +#define MAP_ROUTE122 (37 | (0 << 8)) +#define MAP_ROUTE123 (38 | (0 << 8)) +#define MAP_ROUTE124 (39 | (0 << 8)) +#define MAP_ROUTE125 (40 | (0 << 8)) +#define MAP_ROUTE126 (41 | (0 << 8)) +#define MAP_ROUTE127 (42 | (0 << 8)) +#define MAP_ROUTE128 (43 | (0 << 8)) +#define MAP_ROUTE129 (44 | (0 << 8)) +#define MAP_ROUTE130 (45 | (0 << 8)) +#define MAP_ROUTE131 (46 | (0 << 8)) +#define MAP_ROUTE132 (47 | (0 << 8)) +#define MAP_ROUTE133 (48 | (0 << 8)) +#define MAP_ROUTE134 (49 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8)) +#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8)) // Map Group 1 #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 7bed906647..3eec4eef0e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -205,6 +205,8 @@ #define LEVEL_UP_MOVE_LV 0xFE00 #define LEVEL_UP_END 0xFFFF +#define MAX_LEVEL_UP_MOVES 20 + #define MON_MALE 0x00 #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF @@ -231,6 +233,7 @@ #define STATUS_PRIMARY_POKERUS 6 #define STATUS_PRIMARY_FAINTED 7 +#define MAX_PER_STAT_EVS 255 #define MAX_TOTAL_EVS 510 #define EV_ITEM_RAISE_LIMIT 100 diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 5e64048dd2..65aa3e1ca8 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -52,9 +52,9 @@ #define MAPSEC_ROUTE_133 0x30 #define MAPSEC_ROUTE_134 0x31 #define MAPSEC_UNDERWATER_124 0x32 -#define MAPSEC_UNDERWATER_125 0x33 -#define MAPSEC_UNDERWATER_126 0x34 -#define MAPSEC_UNDERWATER_127 0x35 +#define MAPSEC_UNDERWATER_126 0x33 +#define MAPSEC_UNDERWATER_127 0x34 +#define MAPSEC_UNDERWATER_128 0x35 #define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 #define MAPSEC_GRANITE_CAVE 0x37 #define MAPSEC_MT_CHIMNEY 0x38 @@ -70,7 +70,7 @@ #define MAPSEC_AQUA_HIDEOUT_OLD 0x42 #define MAPSEC_SHOAL_CAVE 0x43 #define MAPSEC_SEAFLOOR_CAVERN 0x44 -#define MAPSEC_UNDERWATER_128 0x45 +#define MAPSEC_UNDERWATER_SEAFLOOR_CAVERN 0x45 #define MAPSEC_VICTORY_ROAD 0x46 #define MAPSEC_MIRAGE_ISLAND 0x47 #define MAPSEC_CAVE_OF_ORIGIN 0x48 @@ -207,8 +207,8 @@ #define MAPSEC_MARINE_CAVE 0xCB #define MAPSEC_UNDERWATER_MARINE_CAVE 0xCC #define MAPSEC_TERRA_CAVE 0xCD -#define MAPSEC_UNDERWATER_TERRA_CAVE 0xCE -#define MAPSEC_UNDERWATER_UNK1 0xCF +#define MAPSEC_UNDERWATER_105 0xCE +#define MAPSEC_UNDERWATER_125 0xCF #define MAPSEC_UNDERWATER_129 0xD0 #define MAPSEC_DESERT_UNDERPASS 0xD1 #define MAPSEC_ALTERING_CAVE 0xD2 diff --git a/include/constants/rgb.h b/include/constants/rgb.h index 49b749a95a..69f07763f8 100644 --- a/include/constants/rgb.h +++ b/include/constants/rgb.h @@ -1,6 +1,10 @@ #ifndef GUARD_RGB_H #define GUARD_RGB_H +#define GET_R(color) ((color) & 0x1F) +#define GET_G(color) (((color) >> 5) & 0x1F) +#define GET_B(color) (((color) >> 10) & 0x1F) + #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) #define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r)) #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F)) diff --git a/include/constants/songs.h b/include/constants/songs.h index b44c9f7a8b..a78ee6fafe 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,543 +1,548 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H -#define MUS_DUMMY 0 -#define SE_KAIFUKU 1 // Healing Item -#define SE_PC_LOGIN 2 // PC Logon -#define SE_PC_OFF 3 // PC Shutdown -#define SE_PC_ON 4 // PC Startup -#define SE_SELECT 5 // Cursor Selection -#define SE_WIN_OPEN 6 // Start Menu -#define SE_WALL_HIT 7 // Wall Bump -#define SE_DOOR 8 // Opening Door -#define SE_KAIDAN 9 // Stairs -#define SE_DANSA 10 // Ledge -#define SE_JITENSYA 11 // Bicycle Bell -#define SE_KOUKA_L 12 // Not Very Effective -#define SE_KOUKA_M 13 // Normal Effectiveness -#define SE_KOUKA_H 14 // Super Effective -#define SE_BOWA2 15 // Pokémon Withdrawal -#define SE_POKE_DEAD 16 // Pokémon Fainted -#define SE_NIGERU 17 // Flee from Wild Battle -#define SE_JIDO_DOA 18 // Pokémon Center Door -#define SE_NAMINORI 19 // Briney's Ship -#define SE_BAN 20 // Bang -#define SE_PIN 21 // Exclamation Bubble -#define SE_BOO 22 // Contest Jam -#define SE_BOWA 23 // Giving Poké Ball to Nurse, Poké Ball Wiggle -#define SE_JYUNI 24 // Places in Contest Appearing -#define SE_A 25 // Bard A -#define SE_I 26 // Bard I -#define SE_U 27 // Bard U -#define SE_E 28 // Bard E -#define SE_O 29 // Bard O -#define SE_N 30 // Bard N -#define SE_SEIKAI 31 // Success -#define SE_HAZURE 32 // Failure -#define SE_EXP 33 // Exp. Bar -#define SE_JITE_PYOKO 34 // Bunny Hop -#define SE_MU_PACHI 35 -#define SE_TK_KASYA 36 // Mossdeep Gym/Trick House Switch -#define SE_FU_ZAKU 37 -#define SE_FU_ZAKU2 38 -#define SE_FU_ZUZUZU 39 // Lavaridge Gym Warp -#define SE_RU_GASHIN 40 // Sootopolis Gym - Stairs Appear -#define SE_RU_GASYAN 41 // Sootopolis Gym - Ice Breaking -#define SE_RU_BARI 42 // Sootopolis Gym - Walking on Ice -#define SE_RU_HYUU 43 // Falling Down -#define SE_KI_GASYAN 44 -#define SE_TK_WARPIN 45 // Warp In -#define SE_TK_WARPOUT 46 // Warp Out -#define SE_TU_SAA 47 // Repel -#define SE_HI_TURUN 48 // Moving Obstacle in Fortree Gym -#define SE_TRACK_MOVE 49 // Moving Truck -#define SE_TRACK_STOP 50 // Moving Truck Stop -#define SE_TRACK_HAIKI 51 // Moving Truck Unload -#define SE_TRACK_DOOR 52 // Moving Truck Door -#define SE_MOTER 53 -#define SE_CARD 54 -#define SE_SAVE 55 // Save -#define SE_KON 56 // Poké Ball Bounce 1 -#define SE_KON2 57 // Poké Ball Bounce 2 -#define SE_KON3 58 // Poké Ball Bounce 3 -#define SE_KON4 59 // Poké Ball Bounce 4 -#define SE_SUIKOMU 60 // Poké Ball Trade -#define SE_NAGERU 61 // Poké Ball Throw -#define SE_TOY_C 62 // Note C -#define SE_TOY_D 63 // Note D -#define SE_TOY_E 64 // Note E -#define SE_TOY_F 65 // Note F -#define SE_TOY_G 66 // Note G -#define SE_TOY_A 67 // Note A -#define SE_TOY_B 68 // Note B -#define SE_TOY_C1 69 // Note High C -#define SE_MIZU 70 // Puddle -#define SE_HASHI 71 // Boardwalk -#define SE_DAUGI 72 // Slots Credits -#define SE_PINPON 73 // Ding-dong! -#define SE_FUUSEN1 74 // Red Balloon -#define SE_FUUSEN2 75 // Blue Balloon -#define SE_FUUSEN3 76 // Yellow Balloon -#define SE_TOY_KABE 77 // Breakable Door -#define SE_TOY_DANGO 78 // Mud Ball -#define SE_DOKU 79 // Overworld Poison Damage -#define SE_ESUKA 80 // Escalator -#define SE_T_AME 81 // Rain -#define SE_T_AME_E 82 // Rain Stop -#define SE_T_OOAME 83 // Heavy Rain -#define SE_T_OOAME_E 84 // Heavy Rain Stop -#define SE_T_KOAME 85 // Light Rain -#define SE_T_KOAME_E 86 // Light Rain Stop -#define SE_T_KAMI 87 // Thunder -#define SE_T_KAMI2 88 // Thunder 2 -#define SE_ELEBETA 89 // Elevator -#define SE_HINSI 90 // Low Health -#define SE_EXPMAX 91 // Exp. Max -#define SE_TAMAKORO 92 // Roulette Ball -#define SE_TAMAKORO_E 93 // Roulette Ball 2 -#define SE_BASABASA 94 -#define SE_REGI 95 // Cash Register -#define SE_C_GAJI 96 // Contest Hearts -#define SE_C_MAKU_U 97 // Contest Curtain rise -#define SE_C_MAKU_D 98 // Contest Curtain fall -#define SE_C_PASI 99 -#define SE_C_SYU 100 -#define SE_C_PIKON 101 // Pokémon Appears in Contest -#define SE_REAPOKE 102 // Shiny Pokémon -#define SE_OP_BASYU 103 // Opening Movie -> Title Screen whoosh -#define SE_BT_START 104 // Battle Mugshot whoosh -#define SE_DENDOU 105 // Audience Cheering -#define SE_JIHANKI 106 // Vending Machine -#define SE_TAMA 107 // Orb Used -#define SE_Z_SCROLL 108 // Pokédex Scrolling -#define SE_Z_PAGE 109 // Pokédex Page -#define SE_PN_ON 110 // PokéNav On -#define SE_PN_OFF 111 // PokéNav Off -#define SE_Z_SEARCH 112 // Pokédex Search -#define SE_TAMAGO 113 // Egg hatch -#define SE_TB_START 114 // Battle - Poké Ball Tray slide in -#define SE_TB_KON 115 // Battle - Poké Ball Tray ball sound -#define SE_TB_KARA 116 // Battle - Poké Ball Tray slide out -#define SE_BIDORO 117 -#define SE_W085 118 // Thunderbolt -#define SE_W085B 119 // Thunderbolt 2 -#define SE_W231 120 // Harden -#define SE_W171 121 // Nightmare -#define SE_W233 122 // Vital Throw -#define SE_W233B 123 // Vital Throw 2 -#define SE_W145 124 // Bubble -#define SE_W145B 125 // Bubble 2 -#define SE_W145C 126 // Bubble 3 -#define SE_W240 127 // Rain Dance -#define SE_W015 128 // Cut -#define SE_W081 129 // String Shot -#define SE_W081B 130 // String Shot 2 -#define SE_W088 131 // Rock Throw -#define SE_W016 132 // Gust -#define SE_W016B 133 // Gust 2 -#define SE_W003 134 // DoubleSlap -#define SE_W104 135 // Double Team -#define SE_W013 136 // Razor Wind -#define SE_W196 137 // Icy Wind -#define SE_W086 138 // Thunder Wave -#define SE_W004 139 // Comet Punch -#define SE_W025 140 // Mega Kick -#define SE_W025B 141 // Mega Kick 2 -#define SE_W152 142 // Crabhammer -#define SE_W026 143 // Jump Kick -#define SE_W172 144 // Flame Wheel -#define SE_W172B 145 // Flame Wheel 2 -#define SE_W053 146 // Flamethrower -#define SE_W007 147 // Fire Punch -#define SE_W092 148 // Toxic -#define SE_W221 149 // Sacred Fire -#define SE_W221B 150 // Sacred Fire 2 -#define SE_W052 151 // Ember -#define SE_W036 152 // Take Down -#define SE_W059 153 // Blizzard -#define SE_W059B 154 // Blizzard 2 -#define SE_W010 155 // Scratch -#define SE_W011 156 // Vicegrip -#define SE_W017 157 // Wing Attack -#define SE_W019 158 // Fly -#define SE_W028 159 // Sand-Attack -#define SE_W013B 160 // Razor Wind 2 -#define SE_W044 161 // Bite -#define SE_W029 162 // Headbutt -#define SE_W057 163 // Surf -#define SE_W056 164 // Hydro Pump -#define SE_W250 165 // Whirlpool -#define SE_W030 166 // Horn Attack -#define SE_W039 167 // Tail Whip -#define SE_W054 168 // Mist -#define SE_W077 169 // PoisonPowder -#define SE_W020 170 // Bind -#define SE_W082 171 // Dragon Rage -#define SE_W047 172 // Sing -#define SE_W195 173 // Perish Song -#define SE_W006 174 // Pay Day -#define SE_W091 175 // Dig -#define SE_W146 176 // Dizzy Punch -#define SE_W120 177 // Self-Destruct -#define SE_W153 178 // Explosion -#define SE_W071B 179 // Absorb 2 -#define SE_W071 180 // Absorb -#define SE_W103 181 // Screech -#define SE_W062 182 // BubbleBeam -#define SE_W062B 183 // BubbleBeam 2 -#define SE_W048 184 // Supersonic -#define SE_W187 185 // Belly Drum -#define SE_W118 186 // Metronome -#define SE_W155 187 // Bonemerang -#define SE_W122 188 // Lick -#define SE_W060 189 // Psybeam -#define SE_W185 190 // Faint Attack -#define SE_W014 191 // Swords Dance -#define SE_W043 192 // Leer -#define SE_W207 193 // Swagger -#define SE_W207B 194 // Swagger 2 -#define SE_W215 195 // Heal Bell -#define SE_W109 196 // Confuse Ray -#define SE_W173 197 // Snore -#define SE_W280 198 // Brick Break -#define SE_W202 199 // Giga Drain -#define SE_W060B 200 // Psybeam 2 -#define SE_W076 201 // SolarBeam -#define SE_W080 202 // Petal Dance -#define SE_W100 203 // Teleport -#define SE_W107 204 // Minimize -#define SE_W166 205 // Sketch -#define SE_W129 206 // Swift -#define SE_W115 207 // Reflect -#define SE_W112 208 // Barrier -#define SE_W197 209 // Detect -#define SE_W199 210 // Lock-On -#define SE_W236 211 // Moonlight -#define SE_W204 212 // Charm -#define SE_W268 213 // Charge -#define SE_W070 214 // Strength -#define SE_W063 215 // Hyper Beam -#define SE_W127 216 // Waterfall -#define SE_W179 217 // Reversal -#define SE_W151 218 // Acid Armor -#define SE_W201 219 // Sandstorm -#define SE_W161 220 // Tri-Attack -#define SE_W161B 221 // Tri-Attack 2 -#define SE_W227 222 // Encore -#define SE_W227B 223 // Encore 2 -#define SE_W226 224 // Baton Pass -#define SE_W208 225 // Milk Drink -#define SE_W213 226 // Attract -#define SE_W213B 227 // Attract 2 -#define SE_W234 228 // Morning Sun -#define SE_W260 229 // Flatter -#define SE_W328 230 // Sand Tomb -#define SE_W320 231 // GrassWhistle -#define SE_W255 232 // Spit Up -#define SE_W291 233 // Dive -#define SE_W089 234 // Earthquake -#define SE_W239 235 // Twister -#define SE_W230 236 // Sweet Scent -#define SE_W281 237 // Yawn -#define SE_W327 238 // Sky Uppercut -#define SE_W287 239 // Stat Increased -#define SE_W257 240 // Heat Wave -#define SE_W253 241 // Uproar -#define SE_W258 242 // Hail -#define SE_W322 243 // Cosmic Power -#define SE_W298 244 // Teeter Dance -#define SE_W287B 245 // Stat Decreased -#define SE_W114 246 // Haze -#define SE_W063B 247 // Hyper Beam 2 -// FRLG SFX below -#define SE_RG_W_DOOR 248 // Door -#define SE_RG_CARD1 249 // Trainer Card 1 -#define SE_RG_CARD2 250 // Trainer Card 2 -#define SE_RG_CARD3 251 // Trainer Card 3 -#define SE_RG_BAG1 252 // Bag Scroll -#define SE_RG_BAG2 253 // Bag Pocket Change -#define SE_RG_GETTING 254 -#define SE_RG_SHOP 255 // Cash Register -#define SE_RG_KITEKI 256 // S.S. Anne Horn -#define SE_RG_HELP_OP 257 // Help Menu Open -#define SE_RG_HELP_CL 258 // Help Menu Close -#define SE_RG_HELP_NG 259 // Help Menu Error -#define SE_RG_DEOMOV 260 // Deoxys Moves -#define SE_RG_EXCELLENT 261 -#define SE_RG_NAWAMISS 262 -// end FRLG SFX -#define SE_TOREEYE 263 // Trainer's Eye Call -#define SE_TOREOFF 264 // Trainer's Eye Hang Up -#define SE_HANTEI1 265 // Battle Arena Time's Up 1 -#define SE_HANTEI2 266 // Battle Arena Time's Up 2 -#define SE_CURTAIN 267 // Battle Pike Curtain Open -#define SE_CURTAIN1 268 // Battle Pike Curtain Close -#define SE_USSOKI 269 // Sudowoodo +// Original JP names listed on right, along with any additional notes -#define MUS_TETSUJI 350 // Littleroot Town Test 'TETSUJI' -#define MUS_FIELD13 351 // GSC - Route 38 -#define MUS_KACHI22 352 // Wild Pokémon Defeated -#define MUS_KACHI2 353 // Wild Pokémon Defeated with Intro -#define MUS_KACHI3 354 // Gym Leader Defeated -#define MUS_KACHI5 355 // Victory! Elite Four -#define MUS_PCC 356 // Crystal - Pokémon Communication Center -#define MUS_NIBI 357 // GSC - Viridian/Saffron/Pewter/etc -#define MUS_SUIKUN 358 // Crystal - Battle! Legendary Beasts -#define MUS_DOORO1 359 // Route 101 -#define MUS_DOORO_X1 360 // Route 110 -#define MUS_DOORO_X3 361 // Route 120 -#define MUS_MACHI_S2 362 // Petalburg City -#define MUS_MACHI_S4 363 // Oldale/Lavaridge Town -#define MUS_GIM 364 // Gym -#define MUS_NAMINORI 365 // Surfing -#define MUS_DAN01 366 // Caves and Darkness -#define MUS_FANFA1 367 // Level Up! -#define MUS_ME_ASA 368 // Pokémon Healed -#define MUS_ME_BACHI 369 // Obtained a Badge! -#define MUS_FANFA4 370 // Obtained an Item! -#define MUS_FANFA5 371 // Your Pokémon Just Evolved! -#define MUS_ME_WAZA 372 // Obtained a TM/HM! -#define MUS_BIJYUTU 373 // Lilycove Museum -#define MUS_DOORO_X4 374 // Route 122/Intro -#define MUS_FUNE_KAN 375 // Slateport Museum -#define MUS_ME_SHINKA 376 // Evolution Intro -#define MUS_SHINKA 377 // Evolution -#define MUS_ME_WASURE 378 // Move Deleted/Messed Up Appeal -#define MUS_SYOUJOEYE 379 // Encounter! Tuber -#define MUS_BOYEYE 380 // Encounter! Boy -#define MUS_DAN02 381 // Abandoned Ship/Southern Island -#define MUS_MACHI_S3 382 // Fortree City/Pacifidlog Town -#define MUS_ODAMAKI 383 // Professor Birch's Lab -#define MUS_B_TOWER 384 // Battle Tower (RS) -#define MUS_SWIMEYE 385 // Encounter! Swimmer -#define MUS_DAN03 386 // Meteor Falls/Cave of Origin -#define MUS_ME_KINOMI 387 // Obtained a Berry! -#define MUS_ME_TAMA 388 // Awakening the Super-Ancient Pokémon -#define MUS_ME_B_BIG 389 // Slots Jackpot! -#define MUS_ME_B_SMALL 390 // Slots Victory! -#define MUS_ME_ZANNEN 391 // Too bad! -#define MUS_BD_TIME 392 // Roulette! -#define MUS_TEST1 393 // Contest Test 1 -#define MUS_TEST2 394 // Contest Test 2 -#define MUS_TEST3 395 // Contest Test 3 -#define MUS_TEST4 396 // Contest Test 4 -#define MUS_TEST 397 // Encounter! Gentleman -#define MUS_GOMACHI0 398 // Verdanturf Town -#define MUS_GOTOWN 399 // Rustboro/Mauville/Mossdeep City -#define MUS_POKECEN 400 // Pokémon Center -#define MUS_NEXTROAD 401 // Route 104 -#define MUS_GRANROAD 402 // Route 119 -#define MUS_CYCLING 403 // Cycling -#define MUS_FRIENDLY 404 // Pokémart -#define MUS_MISHIRO 405 // Littleroot Town -#define MUS_TOZAN 406 // Sky Pillar -#define MUS_GIRLEYE 407 // Encounter! Girl -#define MUS_MINAMO 408 // Lilycove City -#define MUS_ASHROAD 409 // Route 111 -#define MUS_EVENT0 410 // Help me! -#define MUS_DEEPDEEP 411 // Underwater -#define MUS_KACHI1 412 // Victory! Trainer -#define MUS_TITLE3 413 // Title Screen -#define MUS_DEMO1 414 // Opening Movie -#define MUS_GIRL_SUP 415 // Encounter! May -#define MUS_HAGESHII 416 // Encounter! Biker -#define MUS_KAKKOII 417 // Encounter! Electric Trainer -#define MUS_KAZANBAI 418 // Route 113 -#define MUS_AQA_0 419 // Encounter! Team Aqua -#define MUS_TSURETEK 420 // Follow Me! -#define MUS_BOY_SUP 421 // Encounter! Brendan -#define MUS_RAINBOW 422 // Ever Grande City -#define MUS_AYASII 423 // Encounter! Psychic -#define MUS_KACHI4 424 // Victory! Aqua/Magma Grunt -#define MUS_ROPEWAY 425 // Cable Car -#define MUS_CASINO 426 // Game Corner -#define MUS_HIGHTOWN 427 // Dewford Town -#define MUS_SAFARI 428 // Safari Zone -#define MUS_C_ROAD 429 // Victory Road -#define MUS_AJITO 430 // Aqua/Magma Hideout -#define MUS_M_BOAT 431 // Sailing -#define MUS_M_DUNGON 432 // Mt. Pyre (Inside) -#define MUS_FINECITY 433 // Slateport City -#define MUS_MACHUPI 434 // Mt. Pyre (Outside) -#define MUS_P_SCHOOL 435 // Pokémon Trainer's School -#define MUS_DENDOU 436 // You're the Champion! -#define MUS_TONEKUSA 437 // Fallarbor Town -#define MUS_MABOROSI 438 // Sealed Chamber -#define MUS_CON_FAN 439 // Obtained a Contest Ribbon! -#define MUS_CONTEST0 440 // Pokémon Contest -#define MUS_MGM0 441 // Encounter! Team Magma -#define MUS_T_BATTLE 442 // Opening Battle -#define MUS_OOAME 443 // The Flood -#define MUS_HIDERI 444 // The Drought -#define MUS_RUNECITY 445 // Sootopolis City -#define MUS_CON_K 446 // Contest/Berry Blending Results -#define MUS_EIKOU_R 447 // Hall of Fame -#define MUS_KARAKURI 448 // Trick House -#define MUS_HUTAGO 449 // Encounter! Kid -#define MUS_SITENNOU 450 // Encounter! Elite Four -#define MUS_YAMA_EYE 451 // Encounter! Hiker -#define MUS_CONLOBBY 452 // Contest Lobby -#define MUS_INTER_V 453 // Encounter! Gabby and Ty -#define MUS_DAIGO 454 // Encounter! Wallace -#define MUS_THANKFOR 455 // Credits -#define MUS_END 456 // The End -#define MUS_B_FRONTIER 457 // Battle Frontier -#define MUS_B_ARENA 458 // Battle Arena -#define MUS_ME_POINTGET 459 // Obtained Battle Points! -#define MUS_ME_TORE_EYE 460 // Registered Trainer! -#define MUS_PYRAMID 461 // Battle Pyramid -#define MUS_PYRAMID_TOP 462 // Top of the Battle Pyramid -#define MUS_B_PALACE 463 // Battle Palace -#define MUS_REKKUU_KOURIN 464 // Rayquaza Enters -#define MUS_SATTOWER 465 // Battle Tower (Emerald) -#define MUS_ME_SYMBOLGET 466 // Obtained a Frontier Symbol! -#define MUS_B_DOME 467 // Battle Dome -#define MUS_B_TUBE 468 // Battle Pike -#define MUS_B_FACTORY 469 // Battle Factory -#define MUS_VS_REKKU 470 // Battle! Legendary Pokémon -#define MUS_VS_FRONT 471 // Battle! Frontier Brain -#define MUS_VS_MEW 472 // Battle! Mew -#define MUS_B_DOME1 473 // Battle Dome Lobby -#define MUS_BATTLE27 474 // Battle! Wild Pokémon -#define MUS_BATTLE31 475 // Battle! Team Aqua/Magma -#define MUS_BATTLE20 476 // Battle! Trainer -#define MUS_BATTLE32 477 // Battle! Gym Leader -#define MUS_BATTLE33 478 // Battle! Champion -#define MUS_BATTLE36 479 // Battle! Regi Trio -#define MUS_BATTLE34 480 // Battle! Legendary Pokémon (dupe) -#define MUS_BATTLE35 481 // Battle! Rival -#define MUS_BATTLE38 482 // Battle! Elite Four -#define MUS_BATTLE30 483 // Battle! Archie/Maxie -// FRLG Music Below -#define MUS_RG_ANNAI 484 // Follow Me! -#define MUS_RG_SLOT 485 // Game Corner -#define MUS_RG_AJITO 486 // Rocket Hideout -#define MUS_RG_GYM 487 // Gym -#define MUS_RG_PURIN 488 // Jigglypuff's Song -#define MUS_RG_DEMO 489 // Opening Movie -#define MUS_RG_TITLE 490 // Title Screen -#define MUS_RG_GUREN 491 // Cinnabar Island -#define MUS_RG_SHION 492 // Lavender Town -#define MUS_RG_KAIHUKU 493 // RBY Pokémon Center Healing -#define MUS_RG_CYCLING 494 // Cycling -#define MUS_RG_ROCKET 495 // Encounter! Team Rocket -#define MUS_RG_SHOUJO 496 // Encounter! Girl -#define MUS_RG_SHOUNEN 497 // Encounter! Boy -#define MUS_RG_DENDOU 498 // You're the Champion! -#define MUS_RG_T_MORI 499 // Viridian Forest -#define MUS_RG_OTSUKIMI 500 // Mt. Moon -#define MUS_RG_POKEYASHI 501 // Pokémon Mansion -#define MUS_RG_ENDING 502 // Credits -#define MUS_RG_LOAD01 503 // Route 1 -#define MUS_RG_OPENING 504 // Route 24/Intro -#define MUS_RG_LOAD02 505 // Route 3 -#define MUS_RG_LOAD03 506 // Route 11 -#define MUS_RG_CHAMP_R 507 // Victory Road/Indigo Plateau -#define MUS_RG_VS_GYM 508 // Battle! Gym Leader/Elite Four -#define MUS_RG_VS_TORE 509 // Battle! Trainer -#define MUS_RG_VS_YASEI 510 // Battle! Wild Pokémon -#define MUS_RG_VS_LAST 511 // Battle! Champion -#define MUS_RG_MASARA 512 // Pallet Town -#define MUS_RG_KENKYU 513 // Professor Oak's Lab -#define MUS_RG_OHKIDO 514 // Professor Oak's Theme -#define MUS_RG_POKECEN 515 // Pokémon Center -#define MUS_RG_SANTOAN 516 // S.S. Anne -#define MUS_RG_NAMINORI 517 // Surfing -#define MUS_RG_P_TOWER 518 // Pokémon Tower -#define MUS_RG_SHIRUHU 519 // Silph Co. -#define MUS_RG_HANADA 520 // Cerulean/Fuschia City -#define MUS_RG_TAMAMUSI 521 // Celadon City -#define MUS_RG_WIN_TRE 522 // Victory! Trainer -#define MUS_RG_WIN_YASEI 523 // Victory! Wild Pokémon -#define MUS_RG_WIN_GYM 524 // Victory! Gym Leader -#define MUS_RG_KUCHIBA 525 // Vermillion City -#define MUS_RG_NIBI 526 // Viridian/Saffron/Pewter City -#define MUS_RG_RIVAL1 527 // Encounter! Rival -#define MUS_RG_RIVAL2 528 // Rival's Exit -#define MUS_RG_FAN2 529 // Fanfare 2 -#define MUS_RG_FAN5 530 // Obtained a Starter! -#define MUS_RG_FAN6 531 // Pokémon Caught! (Used in Emerald) -#define MUS_ME_RG_PHOTO 532 // Trainer Photo -#define MUS_RG_TITLEROG 533 // Game Freak -#define MUS_RG_GET_YASEI 534 // Pokémon Caught Victory Theme -#define MUS_RG_SOUSA 535 // Starting Tutorial -#define MUS_RG_SEKAIKAN 536 // Starting Tutorial 2 -#define MUS_RG_SEIBETU 537 // Starting Tutorial 3 -#define MUS_RG_JUMP 538 // Pokemon Jump Minigame -#define MUS_RG_UNION 539 // Union Room -#define MUS_RG_NETWORK 540 // Network Center -#define MUS_RG_OKURIMONO 541 // Mystery Gift -#define MUS_RG_KINOMIKUI 542 // Dodrio Berry Picking -#define MUS_RG_NANADUNGEON 543 // Sevii Caves/Altering Cave (Mt. Moon) -#define MUS_RG_OSHIE_TV 544 // Follow Me! -#define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage) -#define MUS_RG_NANAISEKI 546 // Sevii Forests (Viridian Forest) -#define MUS_RG_NANA123 547 // Sevii Islands 1-3 (Viridian/Saffron/Pewter) -#define MUS_RG_NANA45 548 // Sevii Islands 4-5 (Azalea Town) -#define MUS_RG_NANA67 549 // Sevii Islands 6-7 (Violet City) -#define MUS_RG_POKEFUE 550 // Poké Flute -#define MUS_RG_VS_DEO 551 // Battle! Deoxys -#define MUS_RG_VS_MYU2 552 // Battle! Mewtwo -#define MUS_RG_VS_DEN 553 // Battle! Legendary Birds -#define MUS_RG_EXEYE 554 // Encounter! Gym Leader -#define MUS_RG_DEOEYE 555 // Encounter! Deoxys -#define MUS_RG_T_TOWER 556 // Trainer Tower (Gym) -#define MUS_RG_SLOWMASARA 557 // Pallet Town (Hall of Fame remix) -#define MUS_RG_TVNOIZE 558 // Teachy TV -#define PH_TRAP_BLEND 559 -#define PH_TRAP_HELD 560 -#define PH_TRAP_SOLO 561 -#define PH_FACE_BLEND 562 -#define PH_FACE_HELD 563 -#define PH_FACE_SOLO 564 -#define PH_CLOTH_BLEND 565 -#define PH_CLOTH_HELD 566 -#define PH_CLOTH_SOLO 567 -#define PH_DRESS_BLEND 568 -#define PH_DRESS_HELD 569 -#define PH_DRESS_SOLO 570 -#define PH_FLEECE_BLEND 571 -#define PH_FLEECE_HELD 572 -#define PH_FLEECE_SOLO 573 -#define PH_KIT_BLEND 574 -#define PH_KIT_HELD 575 -#define PH_KIT_SOLO 576 -#define PH_PRICE_BLEND 577 -#define PH_PRICE_HELD 578 -#define PH_PRICE_SOLO 579 -#define PH_LOT_BLEND 580 -#define PH_LOT_HELD 581 -#define PH_LOT_SOLO 582 -#define PH_GOAT_BLEND 583 -#define PH_GOAT_HELD 584 -#define PH_GOAT_SOLO 585 -#define PH_THOUGHT_BLEND 586 -#define PH_THOUGHT_HELD 587 -#define PH_THOUGHT_SOLO 588 -#define PH_CHOICE_BLEND 589 -#define PH_CHOICE_HELD 590 -#define PH_CHOICE_SOLO 591 -#define PH_MOUTH_BLEND 592 -#define PH_MOUTH_HELD 593 -#define PH_MOUTH_SOLO 594 -#define PH_FOOT_BLEND 595 -#define PH_FOOT_HELD 596 -#define PH_FOOT_SOLO 597 -#define PH_GOOSE_BLEND 598 -#define PH_GOOSE_HELD 599 -#define PH_GOOSE_SOLO 600 -#define PH_STRUT_BLEND 601 -#define PH_STRUT_HELD 602 -#define PH_STRUT_SOLO 603 -#define PH_CURE_BLEND 604 -#define PH_CURE_HELD 605 -#define PH_CURE_SOLO 606 -#define PH_NURSE_BLEND 607 -#define PH_NURSE_HELD 608 -#define PH_NURSE_SOLO 609 +#define MUS_DUMMY 0 // MUS_DUMMY +#define SE_USE_ITEM 1 // SE_KAIFUKU +#define SE_PC_LOGIN 2 // SE_PC_LOGIN +#define SE_PC_OFF 3 // SE_PC_OFF +#define SE_PC_ON 4 // SE_PC_ON +#define SE_SELECT 5 // SE_SELECT +#define SE_WIN_OPEN 6 // SE_WIN_OPEN +#define SE_WALL_HIT 7 // SE_WALL_HIT +#define SE_DOOR 8 // SE_DOOR +#define SE_EXIT 9 // SE_KAIDAN +#define SE_LEDGE 10 // SE_DANSA +#define SE_BIKE_BELL 11 // SE_JITENSYA +#define SE_NOT_EFFECTIVE 12 // SE_KOUKA_L +#define SE_EFFECTIVE 13 // SE_KOUKA_M +#define SE_SUPER_EFFECTIVE 14 // SE_KOUKA_H +#define SE_BALL_OPEN 15 // SE_BOWA2 +#define SE_FAINT 16 // SE_POKE_DEAD +#define SE_FLEE 17 // SE_NIGERU +#define SE_SLIDING_DOOR 18 // SE_JIDO_DOA +#define SE_SHIP 19 // SE_NAMINORI +#define SE_BANG 20 // SE_BAN +#define SE_PIN 21 // SE_PIN (General "good", commonly for "!") +#define SE_BOO 22 // SE_BOO (General "bad") +#define SE_BALL 23 // SE_BOWA (Giving Poké Ball to nurse, Poké Ball shake, etc) +#define SE_CONTEST_PLACE 24 // SE_JYUNI +#define SE_A 25 // SE_A (Bard sounds) +#define SE_I 26 // SE_I +#define SE_U 27 // SE_U +#define SE_E 28 // SE_E +#define SE_O 29 // SE_O +#define SE_N 30 // SE_N +#define SE_SUCCESS 31 // SE_SEIKAI +#define SE_FAILURE 32 // SE_HAZURE +#define SE_EXP 33 // SE_EXP +#define SE_BIKE_HOP 34 // SE_JITE_PYOKO +#define SE_SWITCH 35 // SE_MU_PACHI +#define SE_CLICK 36 // SE_TK_KASYA +#define SE_FU_ZAKU 37 // SE_FU_ZAKU (Unknown purpose, unused) +#define SE_CONTEST_CONDITION_LOSE 38 // SE_FU_ZAKU2 +#define SE_LAVARIDGE_FALL_WARP 39 // SE_FU_ZUZUZU +#define SE_ICE_STAIRS 40 // SE_RU_GASHIN +#define SE_ICE_BREAK 41 // SE_RU_GASYAN +#define SE_ICE_CRACK 42 // SE_RU_BARI +#define SE_FALL 43 // SE_RU_HYUU +#define SE_UNLOCK 44 // SE_KI_GASYAN +#define SE_WARP_IN 45 // SE_TK_WARPIN +#define SE_WARP_OUT 46 // SE_TK_WARPOUT +#define SE_REPEL 47 // SE_TU_SAA +#define SE_ROTATING_GATE 48 // SE_HI_TURUN +#define SE_TRUCK_MOVE 49 // SE_TRACK_MOVE +#define SE_TRUCK_STOP 50 // SE_TRACK_STOP +#define SE_TRUCK_UNLOAD 51 // SE_TRACK_HAIKI +#define SE_TRUCK_DOOR 52 // SE_TRACK_DOOR +#define SE_BERRY_BLENDER 53 // SE_MOTER +#define SE_CARD 54 // SE_CARD (Unused, different from the RS card SE) +#define SE_SAVE 55 // SE_SAVE +#define SE_BALL_BOUNCE_1 56 // SE_KON +#define SE_BALL_BOUNCE_2 57 // SE_KON2 +#define SE_BALL_BOUNCE_3 58 // SE_KON3 +#define SE_BALL_BOUNCE_4 59 // SE_KON4 +#define SE_BALL_TRADE 60 // SE_SUIKOMU +#define SE_BALL_THROW 61 // SE_NAGERU +#define SE_NOTE_C 62 // SE_TOY_C +#define SE_NOTE_D 63 // SE_TOY_D +#define SE_NOTE_E 64 // SE_TOY_E +#define SE_NOTE_F 65 // SE_TOY_F +#define SE_NOTE_G 66 // SE_TOY_G +#define SE_NOTE_A 67 // SE_TOY_A +#define SE_NOTE_B 68 // SE_TOY_B +#define SE_NOTE_C_HIGH 69 // SE_TOY_C1 +#define SE_PUDDLE 70 // SE_MIZU +#define SE_BRIDGE_WALK 71 // SE_HASHI +#define SE_ITEMFINDER 72 // SE_DAUGI +#define SE_DING_DONG 73 // SE_PINPON +#define SE_BALLOON_RED 74 // SE_FUUSEN1 +#define SE_BALLOON_BLUE 75 // SE_FUUSEN2 +#define SE_BALLOON_YELLOW 76 // SE_FUUSEN3 +#define SE_BREAKABLE_DOOR 77 // SE_TOY_KABE +#define SE_MUD_BALL 78 // SE_TOY_DANGO +#define SE_FIELD_POISON 79 // SE_DOKU +#define SE_ESCALATOR 80 // SE_ESUKA +#define SE_THUNDERSTORM 81 // SE_T_AME +#define SE_THUNDERSTORM_STOP 82 // SE_T_AME_E +#define SE_DOWNPOUR 83 // SE_T_OOAME +#define SE_DOWNPOUR_STOP 84 // SE_T_OOAME_E +#define SE_RAIN 85 // SE_T_KOAME +#define SE_RAIN_STOP 86 // SE_T_KOAME_E +#define SE_THUNDER 87 // SE_T_KAMI +#define SE_THUNDER2 88 // SE_T_KAMI2 +#define SE_ELEVATOR 89 // SE_ELEBETA +#define SE_LOW_HEALTH 90 // SE_HINSI +#define SE_EXP_MAX 91 // SE_EXPMAX +#define SE_ROULETTE_BALL 92 // SE_TAMAKORO +#define SE_ROULETTE_BALL2 93 // SE_TAMAKORO_E +#define SE_TAILLOW_WING_FLAP 94 // SE_BASABASA +#define SE_SHOP 95 // SE_REGI +#define SE_CONTEST_HEART 96 // SE_C_GAJI +#define SE_CONTEST_CURTAIN_RISE 97 // SE_C_MAKU_U +#define SE_CONTEST_CURTAIN_FALL 98 // SE_C_MAKU_D +#define SE_CONTEST_ICON_CHANGE 99 // SE_C_PASI +#define SE_CONTEST_ICON_CLEAR 100 // SE_C_SYU +#define SE_CONTEST_MONS_TURN 101 // SE_C_PIKON +#define SE_SHINY 102 // SE_REAPOKE +#define SE_INTRO_BLAST 103 // SE_OP_BASYU +#define SE_MUGSHOT 104 // SE_BT_START +#define SE_APPLAUSE 105 // SE_DENDOU +#define SE_VEND 106 // SE_JIHANKI +#define SE_ORB 107 // SE_TAMA +#define SE_DEX_SCROLL 108 // SE_Z_SCROLL +#define SE_DEX_PAGE 109 // SE_Z_PAGE +#define SE_POKENAV_ON 110 // SE_PN_ON +#define SE_POKENAV_OFF 111 // SE_PN_OFF +#define SE_DEX_SEARCH 112 // SE_Z_SEARCH +#define SE_EGG_HATCH 113 // SE_TAMAGO +#define SE_BALL_TRAY_ENTER 114 // SE_TB_START +#define SE_BALL_TRAY_BALL 115 // SE_TB_KON +#define SE_BALL_TRAY_EXIT 116 // SE_TB_KARA +#define SE_GLASS_FLUTE 117 // SE_BIDORO +// Move SFX +#define SE_M_THUNDERBOLT 118 // SE_W085 +#define SE_M_THUNDERBOLT2 119 // SE_W085B +#define SE_M_HARDEN 120 // SE_W231 +#define SE_M_NIGHTMARE 121 // SE_W171 +#define SE_M_VITAL_THROW 122 // SE_W233 +#define SE_M_VITAL_THROW2 123 // SE_W233B +#define SE_M_BUBBLE 124 // SE_W145 +#define SE_M_BUBBLE2 125 // SE_W145B +#define SE_M_BUBBLE3 126 // SE_W145C +#define SE_M_RAIN_DANCE 127 // SE_W240 +#define SE_M_CUT 128 // SE_W015 +#define SE_M_STRING_SHOT 129 // SE_W081 +#define SE_M_STRING_SHOT2 130 // SE_W081B +#define SE_M_ROCK_THROW 131 // SE_W088 +#define SE_M_GUST 132 // SE_W016 +#define SE_M_GUST2 133 // SE_W016B +#define SE_M_DOUBLE_SLAP 134 // SE_W003 +#define SE_M_DOUBLE_TEAM 135 // SE_W104 +#define SE_M_RAZOR_WIND 136 // SE_W013 +#define SE_M_ICY_WIND 137 // SE_W196 +#define SE_M_THUNDER_WAVE 138 // SE_W086 +#define SE_M_COMET_PUNCH 139 // SE_W004 +#define SE_M_MEGA_KICK 140 // SE_W025 +#define SE_M_MEGA_KICK2 141 // SE_W025B +#define SE_M_CRABHAMMER 142 // SE_W152 +#define SE_M_JUMP_KICK 143 // SE_W026 +#define SE_M_FLAME_WHEEL 144 // SE_W172 +#define SE_M_FLAME_WHEEL2 145 // SE_W172B +#define SE_M_FLAMETHROWER 146 // SE_W053 +#define SE_M_FIRE_PUNCH 147 // SE_W007 +#define SE_M_TOXIC 148 // SE_W092 +#define SE_M_SACRED_FIRE 149 // SE_W221 +#define SE_M_SACRED_FIRE2 150 // SE_W221B +#define SE_M_EMBER 151 // SE_W052 +#define SE_M_TAKE_DOWN 152 // SE_W036 +#define SE_M_BLIZZARD 153 // SE_W059 +#define SE_M_BLIZZARD2 154 // SE_W059B +#define SE_M_SCRATCH 155 // SE_W010 +#define SE_M_VICEGRIP 156 // SE_W011 +#define SE_M_WING_ATTACK 157 // SE_W017 +#define SE_M_FLY 158 // SE_W019 +#define SE_M_SAND_ATTACK 159 // SE_W028 +#define SE_M_RAZOR_WIND2 160 // SE_W013B +#define SE_M_BITE 161 // SE_W044 +#define SE_M_HEADBUTT 162 // SE_W029 +#define SE_M_SURF 163 // SE_W057 +#define SE_M_HYDRO_PUMP 164 // SE_W056 +#define SE_M_WHIRLPOOL 165 // SE_W250 +#define SE_M_HORN_ATTACK 166 // SE_W030 +#define SE_M_TAIL_WHIP 167 // SE_W039 +#define SE_M_MIST 168 // SE_W054 +#define SE_M_POISON_POWDER 169 // SE_W077 +#define SE_M_BIND 170 // SE_W020 +#define SE_M_DRAGON_RAGE 171 // SE_W082 +#define SE_M_SING 172 // SE_W047 +#define SE_M_PERISH_SONG 173 // SE_W195 +#define SE_M_PAY_DAY 174 // SE_W006 +#define SE_M_DIG 175 // SE_W091 +#define SE_M_DIZZY_PUNCH 176 // SE_W146 +#define SE_M_SELF_DESTRUCT 177 // SE_W120 +#define SE_M_EXPLOSION 178 // SE_W153 +#define SE_M_ABSORB_2 179 // SE_W071B +#define SE_M_ABSORB 180 // SE_W071 +#define SE_M_SCREECH 181 // SE_W103 +#define SE_M_BUBBLE_BEAM 182 // SE_W062 +#define SE_M_BUBBLE_BEAM2 183 // SE_W062B +#define SE_M_SUPERSONIC 184 // SE_W048 +#define SE_M_BELLY_DRUM 185 // SE_W187 +#define SE_M_METRONOME 186 // SE_W118 +#define SE_M_BONEMERANG 187 // SE_W155 +#define SE_M_LICK 188 // SE_W122 +#define SE_M_PSYBEAM 189 // SE_W060 +#define SE_M_FAINT_ATTACK 190 // SE_W185 +#define SE_M_SWORDS_DANCE 191 // SE_W014 +#define SE_M_LEER 192 // SE_W043 +#define SE_M_SWAGGER 193 // SE_W207 +#define SE_M_SWAGGER2 194 // SE_W207B +#define SE_M_HEAL_BELL 195 // SE_W215 +#define SE_M_CONFUSE_RAY 196 // SE_W109 +#define SE_M_SNORE 197 // SE_W173 +#define SE_M_BRICK_BREAK 198 // SE_W280 +#define SE_M_GIGA_DRAIN 199 // SE_W202 +#define SE_M_PSYBEAM2 200 // SE_W060B +#define SE_M_SOLAR_BEAM 201 // SE_W076 +#define SE_M_PETAL_DANCE 202 // SE_W080 +#define SE_M_TELEPORT 203 // SE_W100 +#define SE_M_MINIMIZE 204 // SE_W107 +#define SE_M_SKETCH 205 // SE_W166 +#define SE_M_SWIFT 206 // SE_W129 +#define SE_M_REFLECT 207 // SE_W115 +#define SE_M_BARRIER 208 // SE_W112 +#define SE_M_DETECT 209 // SE_W197 +#define SE_M_LOCK_ON 210 // SE_W199 +#define SE_M_MOONLIGHT 211 // SE_W236 +#define SE_M_CHARM 212 // SE_W204 +#define SE_M_CHARGE 213 // SE_W268 +#define SE_M_STRENGTH 214 // SE_W070 +#define SE_M_HYPER_BEAM 215 // SE_W063 +#define SE_M_WATERFALL 216 // SE_W127 +#define SE_M_REVERSAL 217 // SE_W179 +#define SE_M_ACID_ARMOR 218 // SE_W151 +#define SE_M_SANDSTORM 219 // SE_W201 +#define SE_M_TRI_ATTACK 220 // SE_W161 +#define SE_M_TRI_ATTACK2 221 // SE_W161B +#define SE_M_ENCORE 222 // SE_W227 +#define SE_M_ENCORE2 223 // SE_W227B +#define SE_M_BATON_PASS 224 // SE_W226 +#define SE_M_MILK_DRINK 225 // SE_W208 +#define SE_M_ATTRACT 226 // SE_W213 +#define SE_M_ATTRACT2 227 // SE_W213B +#define SE_M_MORNING_SUN 228 // SE_W234 +#define SE_M_FLATTER 229 // SE_W260 +#define SE_M_SAND_TOMB 230 // SE_W328 +#define SE_M_GRASSWHISTLE 231 // SE_W320 +#define SE_M_SPIT_UP 232 // SE_W255 +#define SE_M_DIVE 233 // SE_W291 +#define SE_M_EARTHQUAKE 234 // SE_W089 +#define SE_M_TWISTER 235 // SE_W239 +#define SE_M_SWEET_SCENT 236 // SE_W230 +#define SE_M_YAWN 237 // SE_W281 +#define SE_M_SKY_UPPERCUT 238 // SE_W327 +#define SE_M_STAT_INCREASE 239 // SE_W287 +#define SE_M_HEAT_WAVE 240 // SE_W257 +#define SE_M_UPROAR 241 // SE_W253 +#define SE_M_HAIL 242 // SE_W258 +#define SE_M_COSMIC_POWER 243 // SE_W322 +#define SE_M_TEETER_DANCE 244 // SE_W298 +#define SE_M_STAT_DECREASE 245 // SE_W287B +#define SE_M_HAZE 246 // SE_W114 +#define SE_M_HYPER_BEAM2 247 // SE_W063B +// FRLG SFX +#define SE_RG_DOOR 248 // SE_RG_W_DOOR +#define SE_RG_CARD_FLIP 249 // SE_RG_CARD1 +#define SE_RG_CARD_FLIPPING 250 // SE_RG_CARD2 +#define SE_RG_CARD_OPEN 251 // SE_RG_CARD3 +#define SE_RG_BAG_CURSOR 252 // SE_RG_BAG1 +#define SE_RG_BAG_POCKET 253 // SE_RG_BAG2 +#define SE_RG_BALL_CLICK 254 // SE_RG_GETTING +#define SE_RG_SHOP 255 // SE_RG_SHOP +#define SE_RG_SS_ANNE_HORN 256 // SE_RG_KITEKI +#define SE_RG_HELP_OPEN 257 // SE_RG_HELP_OP +#define SE_RG_HELP_CLOSE 258 // SE_RG_HELP_CL +#define SE_RG_HELP_ERROR 259 // SE_RG_HELP_NG +#define SE_RG_DEOXYS_MOVE 260 // SE_RG_DEOMOV +#define SE_RG_POKE_JUMP_SUCCESS 261 // SE_RG_EXCELLENT +#define SE_RG_POKE_JUMP_FAILURE 262 // SE_RG_NAWAMISS +// New Emerald SFX +#define SE_POKENAV_CALL 263 // SE_TOREEYE +#define SE_POKENAV_HANG_UP 264 // SE_TOREOFF +#define SE_ARENA_TIMEUP1 265 // SE_HANTEI1 +#define SE_ARENA_TIMEUP2 266 // SE_HANTEI2 +#define SE_PIKE_CURTAIN_CLOSE 267 // SE_CURTAIN +#define SE_PIKE_CURTAIN_OPEN 268 // SE_CURTAIN1 +#define SE_SUDOWOODO_SHAKE 269 // SE_USSOKI -#define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). +// Music +#define MUS_LITTLEROOT_TEST 350 // MUS_TETSUJI +#define MUS_GSC_ROUTE38 351 // MUS_FIELD13 +#define MUS_CAUGHT 352 // MUS_KACHI22 +#define MUS_VICTORY_WILD 353 // MUS_KACHI2 +#define MUS_VICTORY_GYM_LEADER 354 // MUS_KACHI3 +#define MUS_VICTORY_LEAGUE 355 // MUS_KACHI5 +#define MUS_C_COMM_CENTER 356 // MUS_PCC +#define MUS_GSC_PEWTER 357 // MUS_NIBI +#define MUS_C_VS_LEGEND_BEAST 358 // MUS_SUIKUN +#define MUS_ROUTE101 359 // MUS_DOORO1 +#define MUS_ROUTE110 360 // MUS_DOORO_X1 +#define MUS_ROUTE120 361 // MUS_DOORO_X3 +#define MUS_PETALBURG 362 // MUS_MACHI_S2 +#define MUS_OLDALE 363 // MUS_MACHI_S4 +#define MUS_GYM 364 // MUS_GIM +#define MUS_SURF 365 // MUS_NAMINORI +#define MUS_PETALBURG_WOODS 366 // MUS_DAN01 +#define MUS_LEVEL_UP 367 // MUS_FANFA1 +#define MUS_HEAL 368 // MUS_ME_ASA +#define MUS_OBTAIN_BADGE 369 // MUS_ME_BACHI +#define MUS_OBTAIN_ITEM 370 // MUS_FANFA4 +#define MUS_EVOLVED 371 // MUS_FANFA5 +#define MUS_OBTAIN_TMHM 372 // MUS_ME_WAZA +#define MUS_LILYCOVE_MUSEUM 373 // MUS_BIJYUTU +#define MUS_ROUTE122 374 // MUS_DOORO_X4 +#define MUS_OCEANIC_MUSEUM 375 // MUS_FUNE_KAN +#define MUS_EVOLUTION_INTRO 376 // MUS_ME_SHINKA +#define MUS_EVOLUTION 377 // MUS_SHINKA +#define MUS_MOVE_DELETED 378 // MUS_ME_WASURE +#define MUS_ENCOUNTER_GIRL 379 // MUS_SYOUJOEYE +#define MUS_ENCOUNTER_MALE 380 // MUS_BOYEYE +#define MUS_ABANDONED_SHIP 381 // MUS_DAN02 +#define MUS_FORTREE 382 // MUS_MACHI_S3 +#define MUS_BIRCH_LAB 383 // MUS_ODAMAKI +#define MUS_B_TOWER_RS 384 // MUS_B_TOWER +#define MUS_ENCOUNTER_SWIMMER 385 // MUS_SWIMEYE +#define MUS_CAVE_OF_ORIGIN 386 // MUS_DAN03 +#define MUS_OBTAIN_BERRY 387 // MUS_ME_KINOMI +#define MUS_AWAKEN_LEGEND 388 // MUS_ME_TAMA +#define MUS_SLOTS_JACKPOT 389 // MUS_ME_B_BIG +#define MUS_SLOTS_WIN 390 // MUS_ME_B_SMALL +#define MUS_TOO_BAD 391 // MUS_ME_ZANNEN +#define MUS_ROULETTE 392 // MUS_BD_TIME +#define MUS_LINK_CONTEST_P1 393 // MUS_TEST1 +#define MUS_LINK_CONTEST_P2 394 // MUS_TEST2 +#define MUS_LINK_CONTEST_P3 395 // MUS_TEST3 +#define MUS_LINK_CONTEST_P4 396 // MUS_TEST4 +#define MUS_ENCOUNTER_RICH 397 // MUS_TEST +#define MUS_VERDANTURF 398 // MUS_GOMACHI0 +#define MUS_RUSTBORO 399 // MUS_GOTOWN +#define MUS_POKE_CENTER 400 // MUS_POKECEN +#define MUS_ROUTE104 401 // MUS_NEXTROAD +#define MUS_ROUTE119 402 // MUS_GRANROAD +#define MUS_CYCLING 403 // MUS_CYCLING +#define MUS_POKE_MART 404 // MUS_FRIENDLY +#define MUS_LITTLEROOT 405 // MUS_MISHIRO +#define MUS_MT_CHIMNEY 406 // MUS_TOZAN +#define MUS_ENCOUNTER_FEMALE 407 // MUS_GIRLEYE +#define MUS_LILYCOVE 408 // MUS_MINAMO +#define MUS_ROUTE111 409 // MUS_ASHROAD +#define MUS_HELP 410 // MUS_EVENT0 +#define MUS_UNDERWATER 411 // MUS_DEEPDEEP +#define MUS_VICTORY_TRAINER 412 // MUS_KACHI1 +#define MUS_TITLE 413 // MUS_TITLE3 +#define MUS_INTRO 414 // MUS_DEMO1 +#define MUS_ENCOUNTER_MAY 415 // MUS_GIRL_SUP +#define MUS_ENCOUNTER_INTENSE 416 // MUS_HAGESHII +#define MUS_ENCOUNTER_COOL 417 // MUS_KAKKOII +#define MUS_ROUTE113 418 // MUS_KAZANBAI +#define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0 +#define MUS_FOLLOW_ME 420 // MUS_TSURETEK +#define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP +#define MUS_EVER_GRANDE 422 // MUS_RAINBOW +#define MUS_ENCOUNTER_SUSPICIOUS 423 // MUS_AYASII +#define MUS_VICTORY_AQUA_MAGMA 424 // MUS_KACHI4 +#define MUS_CABLE_CAR 425 // MUS_ROPEWAY +#define MUS_GAME_CORNER 426 // MUS_CASINO +#define MUS_DEWFORD 427 // MUS_HIGHTOWN +#define MUS_SAFARI_ZONE 428 // MUS_SAFARI +#define MUS_VICTORY_ROAD 429 // MUS_C_ROAD +#define MUS_AQUA_MAGMA_HIDEOUT 430 // MUS_AJITO +#define MUS_SAILING 431 // MUS_M_BOAT +#define MUS_MT_PYRE 432 // MUS_M_DUNGON +#define MUS_SLATEPORT 433 // MUS_FINECITY +#define MUS_MT_PYRE_EXTERIOR 434 // MUS_MACHUPI +#define MUS_SCHOOL 435 // MUS_P_SCHOOL +#define MUS_HALL_OF_FAME 436 // MUS_DENDOU +#define MUS_FALLARBOR 437 // MUS_TONEKUSA +#define MUS_SEALED_CHAMBER 438 // MUS_MABOROSI +#define MUS_CONTEST_WINNER 439 // MUS_CON_FAN +#define MUS_CONTEST 440 // MUS_CONTEST0 +#define MUS_ENCOUNTER_MAGMA 441 // MUS_MGM0 +#define MUS_INTRO_BATTLE 442 // MUS_T_BATTLE +#define MUS_ABNORMAL_WEATHER 443 // MUS_OOAME (Replaces MUS_WEATHER_KYOGRE from R/S) +#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI (Unused, from R/S) +#define MUS_SOOTOPOLIS 445 // MUS_RUNECITY +#define MUS_CONTEST_RESULTS 446 // MUS_CON_K +#define MUS_HALL_OF_FAME_ROOM 447 // MUS_EIKOU_R +#define MUS_TRICK_HOUSE 448 // MUS_KARAKURI +#define MUS_ENCOUNTER_TWINS 449 // MUS_HUTAGO +#define MUS_ENCOUNTER_ELITE_FOUR 450 // MUS_SITENNOU +#define MUS_ENCOUNTER_HIKER 451 // MUS_YAMA_EYE +#define MUS_CONTEST_LOBBY 452 // MUS_CONLOBBY +#define MUS_ENCOUNTER_INTERVIEWER 453 // MUS_INTER_V +#define MUS_ENCOUNTER_CHAMPION 454 // MUS_DAIGO +#define MUS_CREDITS 455 // MUS_THANKFOR +#define MUS_END 456 // MUS_END +#define MUS_B_FRONTIER 457 // MUS_B_FRONTIER +#define MUS_B_ARENA 458 // MUS_B_ARENA +#define MUS_OBTAIN_B_POINTS 459 // MUS_ME_POINTGET +#define MUS_REGISTER_MATCH_CALL 460 // MUS_ME_TORE_EYE +#define MUS_B_PYRAMID 461 // MUS_PYRAMID +#define MUS_B_PYRAMID_TOP 462 // MUS_PYRAMID_TOP +#define MUS_B_PALACE 463 // MUS_B_PALACE +#define MUS_RAYQUAZA_APPEARS 464 // MUS_REKKUU_KOURIN +#define MUS_B_TOWER 465 // MUS_SATTOWER +#define MUS_OBTAIN_SYMBOL 466 // MUS_ME_SYMBOLGET +#define MUS_B_DOME 467 // MUS_B_DOME +#define MUS_B_PIKE 468 // MUS_B_TUBE +#define MUS_B_FACTORY 469 // MUS_B_FACTORY +#define MUS_VS_RAYQUAZA 470 // MUS_VS_REKKU (Identical to MUS_VS_KYOGRE_GROUDON) +#define MUS_VS_FRONTIER_BRAIN 471 // MUS_VS_FRONT +#define MUS_VS_MEW 472 // MUS_VS_MEW +#define MUS_B_DOME_LOBBY 473 // MUS_B_DOME1 +#define MUS_VS_WILD 474 // MUS_BATTLE27 +#define MUS_VS_AQUA_MAGMA 475 // MUS_BATTLE31 +#define MUS_VS_TRAINER 476 // MUS_BATTLE20 +#define MUS_VS_GYM_LEADER 477 // MUS_BATTLE32 +#define MUS_VS_CHAMPION 478 // MUS_BATTLE33 +#define MUS_VS_REGI 479 // MUS_BATTLE36 +#define MUS_VS_KYOGRE_GROUDON 480 // MUS_BATTLE34 +#define MUS_VS_RIVAL 481 // MUS_BATTLE35 +#define MUS_VS_ELITE_FOUR 482 // MUS_BATTLE38 +#define MUS_VS_AQUA_MAGMA_LEADER 483 // MUS_BATTLE30 +// FRLG Music +#define MUS_RG_FOLLOW_ME 484 // MUS_RG_ANNAI +#define MUS_RG_GAME_CORNER 485 // MUS_RG_SLOT +#define MUS_RG_ROCKET_HIDEOUT 486 // MUS_RG_AJITO +#define MUS_RG_GYM 487 // MUS_RG_GYM +#define MUS_RG_JIGGLYPUFF 488 // MUS_RG_PURIN +#define MUS_RG_INTRO_FIGHT 489 // MUS_RG_DEMO +#define MUS_RG_TITLE 490 // MUS_RG_TITLE +#define MUS_RG_CINNABAR 491 // MUS_RG_GUREN +#define MUS_RG_LAVENDER 492 // MUS_RG_SHION +#define MUS_RG_HEAL 493 // MUS_RG_KAIHUKU +#define MUS_RG_CYCLING 494 // MUS_RG_CYCLING +#define MUS_RG_ENCOUNTER_ROCKET 495 // MUS_RG_ROCKET +#define MUS_RG_ENCOUNTER_GIRL 496 // MUS_RG_SHOUJO +#define MUS_RG_ENCOUNTER_BOY 497 // MUS_RG_SHOUNEN +#define MUS_RG_HALL_OF_FAME 498 // MUS_RG_DENDOU +#define MUS_RG_VIRIDIAN_FOREST 499 // MUS_RG_T_MORI +#define MUS_RG_MT_MOON 500 // MUS_RG_OTSUKIMI +#define MUS_RG_POKE_MANSION 501 // MUS_RG_POKEYASHI +#define MUS_RG_CREDITS 502 // MUS_RG_ENDING +#define MUS_RG_ROUTE1 503 // MUS_RG_LOAD01 +#define MUS_RG_ROUTE24 504 // MUS_RG_OPENING +#define MUS_RG_ROUTE3 505 // MUS_RG_LOAD02 +#define MUS_RG_ROUTE11 506 // MUS_RG_LOAD03 +#define MUS_RG_VICTORY_ROAD 507 // MUS_RG_CHAMP_R +#define MUS_RG_VS_GYM_LEADER 508 // MUS_RG_VS_GYM +#define MUS_RG_VS_TRAINER 509 // MUS_RG_VS_TORE +#define MUS_RG_VS_WILD 510 // MUS_RG_VS_YASEI +#define MUS_RG_VS_CHAMPION 511 // MUS_RG_VS_LAST +#define MUS_RG_PALLET 512 // MUS_RG_MASARA +#define MUS_RG_OAK_LAB 513 // MUS_RG_KENKYU +#define MUS_RG_OAK 514 // MUS_RG_OHKIDO +#define MUS_RG_POKE_CENTER 515 // MUS_RG_POKECEN +#define MUS_RG_SS_ANNE 516 // MUS_RG_SANTOAN +#define MUS_RG_SURF 517 // MUS_RG_NAMINORI +#define MUS_RG_POKE_TOWER 518 // MUS_RG_P_TOWER +#define MUS_RG_SILPH 519 // MUS_RG_SHIRUHU +#define MUS_RG_FUCHSIA 520 // MUS_RG_HANADA +#define MUS_RG_CELADON 521 // MUS_RG_TAMAMUSI +#define MUS_RG_VICTORY_TRAINER 522 // MUS_RG_WIN_TRE (Identical to MUS_VICTORY_TRAINER) +#define MUS_RG_VICTORY_WILD 523 // MUS_RG_WIN_YASEI (Identical to MUS_VICTORY_WILD) +#define MUS_RG_VICTORY_GYM_LEADER 524 // MUS_RG_WIN_GYM (Identical to MUS_VICTORY_GYM_LEADER) +#define MUS_RG_VERMILLION 525 // MUS_RG_KUCHIBA +#define MUS_RG_PEWTER 526 // MUS_RG_NIBI +#define MUS_RG_ENCOUNTER_RIVAL 527 // MUS_RG_RIVAL1 +#define MUS_RG_RIVAL_EXIT 528 // MUS_RG_RIVAL2 +#define MUS_RG_DEX_RATING 529 // MUS_RG_FAN2 +#define MUS_RG_OBTAIN_KEY_ITEM 530 // MUS_RG_FAN5 +#define MUS_RG_CAUGHT_INTRO 531 // MUS_RG_FAN6 +#define MUS_RG_PHOTO 532 // MUS_ME_RG_PHOTO +#define MUS_RG_GAME_FREAK 533 // MUS_RG_TITLEROG +#define MUS_RG_CAUGHT 534 // MUS_RG_GET_YASEI +#define MUS_RG_NEW_GAME_INSTRUCT 535 // MUS_RG_SOUSA +#define MUS_RG_NEW_GAME_INTRO 536 // MUS_RG_SEKAIKAN +#define MUS_RG_NEW_GAME_EXIT 537 // MUS_RG_SEIBETU +#define MUS_RG_POKE_JUMP 538 // MUS_RG_JUMP +#define MUS_RG_UNION_ROOM 539 // MUS_RG_UNION +#define MUS_RG_NET_CENTER 540 // MUS_RG_NETWORK +#define MUS_RG_MYSTERY_GIFT 541 // MUS_RG_OKURIMONO +#define MUS_RG_BERRY_PICK 542 // MUS_RG_KINOMIKUI +#define MUS_RG_SEVII_CAVE 543 // MUS_RG_NANADUNGEON (Identical to MUS_RG_MT_MOON) +#define MUS_RG_TEACHY_TV_SHOW 544 // MUS_RG_OSHIE_TV (Identical to MUS_RG_FOLLOW_ME) +#define MUS_RG_SEVII_ROUTE 545 // MUS_RG_NANASHIMA +#define MUS_RG_SEVII_DUNGEON 546 // MUS_RG_NANAISEKI (Identical to MUS_RG_VIRIDIAN_FOREST) +#define MUS_RG_SEVII_123 547 // MUS_RG_NANA123 (Identical to MUS_RG_PEWTER) +#define MUS_RG_SEVII_45 548 // MUS_RG_NANA45 +#define MUS_RG_SEVII_67 549 // MUS_RG_NANA67 +#define MUS_RG_POKE_FLUTE 550 // MUS_RG_POKEFUE +#define MUS_RG_VS_DEOXYS 551 // MUS_RG_VS_DEO +#define MUS_RG_VS_MEWTWO 552 // MUS_RG_VS_MYU2 +#define MUS_RG_VS_LEGEND 553 // MUS_RG_VS_DEN +#define MUS_RG_ENCOUNTER_GYM_LEADER 554 // MUS_RG_EXEYE +#define MUS_RG_ENCOUNTER_DEOXYS 555 // MUS_RG_DEOEYE +#define MUS_RG_TRAINER_TOWER 556 // MUS_RG_T_TOWER +#define MUS_RG_SLOW_PALLET 557 // MUS_RG_SLOWMASARA +#define MUS_RG_TEACHY_TV_MENU 558 // MUS_RG_TVNOIZE -#define MUS_NONE 0xFFFF +#define PH_TRAP_BLEND 559 +#define PH_TRAP_HELD 560 +#define PH_TRAP_SOLO 561 +#define PH_FACE_BLEND 562 +#define PH_FACE_HELD 563 +#define PH_FACE_SOLO 564 +#define PH_CLOTH_BLEND 565 +#define PH_CLOTH_HELD 566 +#define PH_CLOTH_SOLO 567 +#define PH_DRESS_BLEND 568 +#define PH_DRESS_HELD 569 +#define PH_DRESS_SOLO 570 +#define PH_FLEECE_BLEND 571 +#define PH_FLEECE_HELD 572 +#define PH_FLEECE_SOLO 573 +#define PH_KIT_BLEND 574 +#define PH_KIT_HELD 575 +#define PH_KIT_SOLO 576 +#define PH_PRICE_BLEND 577 +#define PH_PRICE_HELD 578 +#define PH_PRICE_SOLO 579 +#define PH_LOT_BLEND 580 +#define PH_LOT_HELD 581 +#define PH_LOT_SOLO 582 +#define PH_GOAT_BLEND 583 +#define PH_GOAT_HELD 584 +#define PH_GOAT_SOLO 585 +#define PH_THOUGHT_BLEND 586 +#define PH_THOUGHT_HELD 587 +#define PH_THOUGHT_SOLO 588 +#define PH_CHOICE_BLEND 589 +#define PH_CHOICE_HELD 590 +#define PH_CHOICE_SOLO 591 +#define PH_MOUTH_BLEND 592 +#define PH_MOUTH_HELD 593 +#define PH_MOUTH_SOLO 594 +#define PH_FOOT_BLEND 595 +#define PH_FOOT_HELD 596 +#define PH_FOOT_SOLO 597 +#define PH_GOOSE_BLEND 598 +#define PH_GOOSE_HELD 599 +#define PH_GOOSE_SOLO 600 +#define PH_STRUT_BLEND 601 +#define PH_STRUT_HELD 602 +#define PH_STRUT_SOLO 603 +#define PH_CURE_BLEND 604 +#define PH_CURE_HELD 605 +#define PH_CURE_SOLO 606 +#define PH_NURSE_BLEND 607 +#define PH_NURSE_HELD 608 +#define PH_NURSE_SOLO 609 + +#define MUS_ROUTE118 0x7FFF // Map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). + +#define MUS_NONE 0xFFFF #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 071a89bc58..1daa99e1d7 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -553,6 +553,7 @@ #define WININ_WIN0_BG_ALL (WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3) #define WININ_WIN0_OBJ (1 << 4) #define WININ_WIN0_CLR (1 << 5) +#define WININ_WIN0_ALL (WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) #define WININ_WIN1_BG0 (1 << 8) #define WININ_WIN1_BG1 (1 << 9) #define WININ_WIN1_BG2 (1 << 10) @@ -560,6 +561,7 @@ #define WININ_WIN1_BG_ALL (WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3) #define WININ_WIN1_OBJ (1 << 12) #define WININ_WIN1_CLR (1 << 13) +#define WININ_WIN1_ALL (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR) #define WINOUT_WIN01_BG0 (1 << 0) #define WINOUT_WIN01_BG1 (1 << 1) @@ -568,6 +570,7 @@ #define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3) #define WINOUT_WIN01_OBJ (1 << 4) #define WINOUT_WIN01_CLR (1 << 5) +#define WINOUT_WIN01_ALL (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR) #define WINOUT_WINOBJ_BG0 (1 << 8) #define WINOUT_WINOBJ_BG1 (1 << 9) #define WINOUT_WINOBJ_BG2 (1 << 10) @@ -575,6 +578,7 @@ #define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3) #define WINOUT_WINOBJ_OBJ (1 << 12) #define WINOUT_WINOBJ_CLR (1 << 13) +#define WINOUT_WINOBJ_ALL (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR) #define WIN_RANGE(a, b) (((a) << 8) | (b)) #define WIN_RANGE2(a, b) ((b) | ((a) << 8)) @@ -585,9 +589,10 @@ #define BLDCNT_TGT1_BG1 (1 << 1) #define BLDCNT_TGT1_BG2 (1 << 2) #define BLDCNT_TGT1_BG3 (1 << 3) +#define BLDCNT_TGT1_BG_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3) #define BLDCNT_TGT1_OBJ (1 << 4) #define BLDCNT_TGT1_BD (1 << 5) -#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) +#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG_ALL | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) // Bits 6-7 select the special effect #define BLDCNT_EFFECT_NONE (0 << 6) // no special effect #define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) @@ -598,9 +603,10 @@ #define BLDCNT_TGT2_BG1 (1 << 9) #define BLDCNT_TGT2_BG2 (1 << 10) #define BLDCNT_TGT2_BG3 (1 << 11) +#define BLDCNT_TGT2_BG_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3) #define BLDCNT_TGT2_OBJ (1 << 12) #define BLDCNT_TGT2_BD (1 << 13) -#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG_ALL | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index e2836c6f6b..bdff1b8651 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -140,55 +140,13 @@ struct SoundChannel struct WaveData *wav; u32 cp; struct MusicPlayerTrack *track; - u32 pp; - u32 np; - u32 d4; + void *pp; + void *np; + void *d4; u16 xpi; u16 xpc; }; -#define MAX_DIRECTSOUND_CHANNELS 12 - -#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer - -struct SoundInfo -{ - // This field is normally equal to ID_NUMBER but it is set to other - // values during sensitive operations for locking purposes. - // This field should be volatile but isn't. This could potentially cause - // race conditions. - u32 ident; - - vu8 pcmDmaCounter; - - // Direct Sound - u8 reverb; - u8 maxChans; - u8 masterVolume; - u8 freq; - - u8 mode; - u8 c15; - u8 pcmDmaPeriod; // number of V-blanks per PCM DMA - u8 maxLines; - u8 gap[3]; - s32 pcmSamplesPerVBlank; - s32 pcmFreq; - s32 divFreq; - struct CgbChannel *cgbChans; - u32 func; - u32 intp; - void (*CgbSound)(void); - void (*CgbOscOff)(u8); - u32 (*MidiKeyToCgbFreq)(u8, u8, u8); - u32 MPlayJumpTable; - u32 plynote; - u32 ExtVolPit; - u8 gap2[16]; - struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS]; - s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2]; -}; - struct SongHeader { u8 trackCount; @@ -312,7 +270,7 @@ struct MusicPlayerInfo struct MusicPlayerTrack *tracks; struct ToneData *tone; u32 ident; - u32 func; + void (*func)(); u32 intp; }; @@ -334,7 +292,47 @@ struct Song extern const struct MusicPlayer gMPlayTable[]; extern const struct Song gSongTable[]; +#define MAX_DIRECTSOUND_CHANNELS 12 +#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer + +struct SoundInfo +{ + // This field is normally equal to ID_NUMBER but it is set to other + // values during sensitive operations for locking purposes. + // This field should be volatile but isn't. This could potentially cause + // race conditions. + u32 ident; + + vu8 pcmDmaCounter; + + // Direct Sound + u8 reverb; + u8 maxChans; + u8 masterVolume; + u8 freq; + + u8 mode; + u8 c15; + u8 pcmDmaPeriod; // number of V-blanks per PCM DMA + u8 maxLines; + u8 gap[3]; + s32 pcmSamplesPerVBlank; + s32 pcmFreq; + s32 divFreq; + struct CgbChannel *cgbChans; + void (*func)(); + u32 intp; + void (*CgbSound)(); + void (*CgbOscOff)(u8); + u32 (*MidiKeyToCgbFreq)(u8, u8, u8); + void (**MPlayJumpTable)(); + void (*plynote)(u8, struct MusicPlayerInfo *, struct MusicPlayerTrack *); + void (*ExtVolPit)(struct MusicPlayerInfo *, struct MusicPlayerTrack *); + u32 gap2[4]; + struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS]; + s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2]; +}; extern u8 gMPlayMemAccArea[]; @@ -448,7 +446,7 @@ void ply_tune(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_port(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_xcmd(struct MusicPlayerInfo *, struct MusicPlayerTrack *); void ply_endtie(struct MusicPlayerInfo *, struct MusicPlayerTrack *); -void ply_note(struct MusicPlayerInfo *, struct MusicPlayerTrack *); +void ply_note(u8, struct MusicPlayerInfo *, struct MusicPlayerTrack *); // extended sound command handler functions void ply_xxx(struct MusicPlayerInfo *, struct MusicPlayerTrack *); diff --git a/include/global.h b/include/global.h index d9ebf8bf61..35c0edac5b 100644 --- a/include/global.h +++ b/include/global.h @@ -99,9 +99,10 @@ #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) // Macros for checking the joypad -#define TEST_BUTTON(field, button) ({(field) & (button);}) +#define TEST_BUTTON(field, button) ((field) & (button)) #define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) #define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) +#define JOY_HELD_RAW(button) TEST_BUTTON(gMain.heldKeysRaw, button) #define JOY_REPEAT(button) TEST_BUTTON(gMain.newAndRepeatedKeys, button) #define S16TOPOSFLOAT(val) \ diff --git a/include/global.tv.h b/include/global.tv.h index b211052e05..8e1a898b61 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -32,7 +32,7 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u16 words[6]; - /*0x10*/ u8 playerName[8]; + /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x18*/ u8 language; } fanclubLetter; @@ -42,7 +42,7 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 var02; /*0x04*/ u16 words[6]; - /*0x10*/ u8 playerName[8]; + /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x18*/ u8 language; } recentHappenings; @@ -53,11 +53,11 @@ typedef union // size = 0x24 /*0x02*/ u16 species; /*0x04*/ u8 friendshipHighNybble:4; /*0x04*/ u8 questionAsked:4; - /*0x05*/ u8 playerName[8]; + /*0x05*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x0D*/ u8 language; /*0x0E*/ u8 pokemonNameLanguage; /*0x0F*/ u8 filler_0F[1]; - /*0x10*/ u8 nickname[8]; + /*0x10*/ u8 nickname[PLAYER_NAME_LENGTH + 1]; /*0x18*/ u16 words18[2]; /*0x1C*/ u16 words[4]; } fanclubOpinions; @@ -78,7 +78,7 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u16 species; - /*0x04*/ u8 pokemonName[11]; + /*0x04*/ u8 pokemonName[POKEMON_NAME_LENGTH + 1]; /*0x0F*/ u8 trainerName[11]; /*0x1A*/ u8 random; /*0x1B*/ u8 random2; @@ -93,12 +93,12 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u16 words[2]; - /*0x08*/ u8 pokemonNickname[11]; + /*0x08*/ u8 pokemonNickname[POKEMON_NAME_LENGTH + 1]; /*0x13*/ u8 contestCategory:3; /*0x13*/ u8 contestRank:2; /*0x13*/ u8 contestResult:2; /*0x14*/ u16 move; - /*0x16*/ u8 playerName[8]; + /*0x16*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x1E*/ u8 language; /*0x1F*/ u8 pokemonNameLanguage; } bravoTrainer; @@ -107,7 +107,7 @@ typedef union // size = 0x24 struct { /*0x00*/ u8 kind; /*0x01*/ bool8 active; - /*0x02*/ u8 trainerName[8]; + /*0x02*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x0A*/ u16 species; /*0x0C*/ u8 pokemonName[8]; /*0x14*/ u16 defeatedSpecies; @@ -125,14 +125,14 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u16 losingSpecies; - /*0x04*/ u8 losingTrainerName[8]; + /*0x04*/ u8 losingTrainerName[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 loserAppealFlag; /*0x0D*/ u8 round1Placing; /*0x0e*/ u8 round2Placing; /*0x0f*/ u8 winnerAppealFlag; /*0x10*/ u16 move; /*0x12*/ u16 winningSpecies; - /*0x14*/ u8 winningTrainerName[8]; + /*0x14*/ u8 winningTrainerName[PLAYER_NAME_LENGTH + 1]; /*0x1C*/ u8 category; /*0x1D*/ u8 winningTrainerLanguage; /*0x1E*/ u8 losingTrainerLanguage; @@ -144,9 +144,9 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u8 sheen; /*0x03*/ u8 flavor:3; - /*0x03*/ u8 unk_03_3:2; - /*0x04*/ u8 worstBlenderName[8]; - /*0x0C*/ u8 playerName[8]; + /*0x03*/ u8 color:2; + /*0x04*/ u8 worstBlenderName[PLAYER_NAME_LENGTH + 1]; + /*0x0C*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x14*/ u8 language; /*0x15*/ u8 worstBlenderLanguage; } threeCheers; @@ -156,8 +156,8 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u16 speciesOpponent; - /*0x04*/ u8 playerName[8]; - /*0x0C*/ u8 linkOpponentName[8]; + /*0x04*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x0C*/ u8 linkOpponentName[PLAYER_NAME_LENGTH + 1]; /*0x14*/ u16 move; /*0x16*/ u16 speciesPlayer; /*0x18*/ u8 battleType; @@ -169,10 +169,10 @@ typedef union // size = 0x24 struct { /*0x00*/ u8 kind; /*0x01*/ bool8 active; - /*0x02*/ u8 playerName[8]; + /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x0a*/ u8 idLo; /*0x0b*/ u8 idHi; - /*0x0c*/ u8 idolName[8]; + /*0x0c*/ u8 idolName[PLAYER_NAME_LENGTH + 1]; /*0x14*/ u16 words[1]; /*0x16*/ u8 score; /*0x17*/ u8 language; @@ -183,9 +183,9 @@ typedef union // size = 0x24 struct { /*0x00*/ u8 kind; /*0x01*/ bool8 active; - /*0x02*/ u8 playerName[8]; + /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x0a*/ u8 contestCategory; - /*0x0b*/ u8 nickname[11]; + /*0x0b*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x16*/ u8 pokeblockState; /*0x17*/ u8 language; /*0x18*/ u8 pokemonNameLanguage; @@ -198,11 +198,11 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u8 language; /*0x03*/ u8 language2; - /*0x04*/ u8 nickname[11]; + /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0F*/ u8 ball; /*0x10*/ u16 species; /*0x12*/ u8 nBallsUsed; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } pokemonToday; // TVSHOW_SMART_SHOPPER @@ -215,7 +215,7 @@ typedef union // size = 0x24 /*0x06*/ u16 itemIds[3]; /*0x0C*/ u16 itemAmounts[3]; /*0x12*/ u8 shopLocation; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } smartshopperShow; // TVSHOW_POKEMON_TODAY_FAILED @@ -229,7 +229,7 @@ typedef union // size = 0x24 /*0x10*/ u8 nBallsUsed; /*0x11*/ u8 outcome; /*0x12*/ u8 location; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } pokemonTodayFailed; // TVSHOW_FISHING_ADVICE @@ -241,7 +241,7 @@ typedef union // size = 0x24 /*0x04*/ u16 species; /*0x06*/ u8 language; /*0x07*/ u8 pad07[12]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } pokemonAngler; // TVSHOW_WORLD_OF_MASTERS @@ -255,7 +255,7 @@ typedef union // size = 0x24 /*0x0a*/ u8 location; /*0x0b*/ u8 language; /*0x0c*/ u8 pad0c[7]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } worldOfMasters; // TVSHOW_TODAYS_RIVAL_TRAINER @@ -271,7 +271,7 @@ typedef union // size = 0x24 /*0x0a*/ u16 mapLayoutId; /*0x0c*/ u8 language; /*0x0d*/ u8 filler_0d[6]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } rivalTrainer; // TVSHOW_TREND_WATCHER @@ -283,7 +283,7 @@ typedef union // size = 0x24 /*0x08*/ u8 gender; /*0x09*/ u8 language; /*0x0a*/ u8 filler_0a[9]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } trendWatcher; // TVSHOW_TREASURE_INVESTIGATORS @@ -295,7 +295,7 @@ typedef union // size = 0x24 /*0x05*/ u8 language; /*0x06*/ u16 mapLayoutId; /*0x08*/ u8 filler_08[11]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } treasureInvestigators; // TVSHOW_FIND_THAT_GAMER @@ -308,7 +308,7 @@ typedef union // size = 0x24 /*0x06*/ u8 filler_06[2]; /*0x08*/ u8 language; /*0x09*/ u8 filler_09[10]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } findThatGamer; // TVSHOW_BREAKING_NEWS @@ -324,7 +324,7 @@ typedef union // size = 0x24 /*0x0c*/ u16 lastUsedMove; /*0x0e*/ u8 language; /*0x0f*/ u8 filler_0f[4]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } breakingNews; // TVSHOW_SECRET_BASE_VISIT @@ -338,7 +338,7 @@ typedef union // size = 0x24 /*0x0a*/ u16 move; /*0x0c*/ u8 language; /*0x0d*/ u8 filler_0d[6]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } secretBaseVisit; // TVSHOW_LOTTO_WINNER @@ -349,7 +349,7 @@ typedef union // size = 0x24 /*0x04*/ u8 whichPrize; /*0x05*/ u8 language; /*0x06*/ u8 filler_06[13]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } lottoWinner; // TVSHOW_BATTLE_SEMINAR @@ -364,7 +364,7 @@ typedef union // size = 0x24 /*0x10*/ u8 nOtherMoves; /*0x11*/ u8 language; /*0x12*/ u8 filler_12[1]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } battleSeminar; // TVSHOW_TRAINER_FAN_CLUB @@ -375,7 +375,7 @@ typedef union // size = 0x24 /*0x04*/ u16 words[2]; /*0x08*/ u8 language; /*0x09*/ u8 filler_09[10]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } trainerFanClub; // TVSHOW_CUTIES @@ -384,11 +384,11 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u8 nRibbons; /*0x03*/ u8 selectedRibbon; - /*0x04*/ u8 nickname[11]; + /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0f*/ u8 language; /*0x10*/ u8 pokemonNameLanguage; /*0x11*/ u8 filler_12[2]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } cuties; // TVSHOW_FRONTIER @@ -403,7 +403,7 @@ typedef union // size = 0x24 /*0x0c*/ u8 language; /*0x0d*/ u8 facility; /*0x0e*/ u8 filler_0e[5]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } frontier; // TVSHOW_NUMBER_ONE @@ -414,7 +414,7 @@ typedef union // size = 0x24 /*0x04*/ u8 actionIdx; /*0x05*/ u8 language; /*0x06*/ u8 filler_06[13]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } numberOne; // TVSHOW_SECRET_BASE_SECRETS @@ -422,11 +422,11 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u16 stepsInBase; - /*0x04*/ u8 baseOwnersName[8]; + /*0x04*/ u8 baseOwnersName[PLAYER_NAME_LENGTH + 1]; /*0x0c*/ u32 flags; /*0x10*/ u16 item; /*0x12*/ u8 savedState; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x1b*/ u8 language; /*0x1c*/ u8 baseOwnersNameLanguage; } secretBaseSecrets; @@ -439,7 +439,7 @@ typedef union // size = 0x24 /*0x03*/ u8 nPkblkUsed; /*0x04*/ u8 language; /*0x05*/ u8 filler_05[14]; - /*0x13*/ u8 playerName[8]; + /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; } safariFanClub; // Mass Outbreak diff --git a/include/graphics.h b/include/graphics.h index 8c31be797c..3ad49f8848 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5363,11 +5363,12 @@ extern const u32 gDecorIconPalette_RegiceDoll[]; extern const u32 gDecorIcon_RegisteelDoll[]; extern const u32 gDecorIconPalette_RegisteelDoll[]; -extern const u32 gWallclock_Gfx[]; -extern const u16 gWallclockMale_Pal[]; -extern const u16 gWallclockFemale_Pal[]; -extern const u32 gUnknown_08DCC648[]; -extern const u32 gUnknown_08DCC908[]; +extern const u32 gWallClock_Gfx[]; +extern const u16 gWallClockMale_Pal[]; +extern const u16 gWallClockFemale_Pal[]; +extern const u32 gWallClockStart_Tilemap[]; +extern const u32 gWallClockView_Tilemap[]; + extern const u32 gBerryFixGameboy_Gfx[]; extern const u32 gBerryFixGameboy_Tilemap[]; extern const u16 gBerryFixGameboy_Pal[]; @@ -5492,57 +5493,57 @@ extern const u32 gBerryTag_Gfx[]; extern const u32 gBerryTag_Pal[]; // rayquaza scene gfx -extern const u32 gRaySceneGroudon_Gfx[]; -extern const u32 gRaySceneGroudon2_Gfx[]; -extern const u32 gRaySceneGroudon3_Gfx[]; -extern const u32 gRaySceneKyogre_Gfx[]; -extern const u32 gRaySceneKyogre2_Gfx[]; -extern const u32 gRaySceneKyogre3_Gfx[]; -extern const u32 gRaySceneGroudon_Pal[]; -extern const u32 gRaySceneKyogre_Pal[]; -extern const u32 gRaySceneSmoke_Gfx[]; -extern const u32 gRaySceneSmoke_Pal[]; -extern const u32 gRaySceneRayquaza_Pal[]; -extern const u32 gRaySceneRayquazaFly1_Gfx[]; -extern const u32 gRaySceneRayquazaTail_Gfx[]; -extern const u32 gRaySceneGroudonLeft_Gfx[]; -extern const u32 gRaySceneGroudonTail_Gfx[]; -extern const u32 gRaySceneKyogreRight_Gfx[]; -extern const u32 gRaySceneRayquazaHover_Gfx[]; -extern const u32 gRaySceneRayquazaFlyIn_Gfx[]; -extern const u32 gRaySceneOvercast_Gfx[]; -extern const u32 gRaySceneOvercast_Tilemap[]; -extern const u32 gRaySceneRayquaza_Gfx[]; -extern const u32 gRaySceneRayquaza_Tilemap[]; -extern const u32 gRaySceneSplash_Gfx[]; -extern const u32 gRaySceneGroudonLeft_Pal[]; -extern const u32 gRaySceneKyogreRight_Pal[]; -extern const u32 gRaySceneRayquazaHover_Pal[]; -extern const u32 gRaySceneSplash_Pal[]; -extern const u32 gRaySceneClouds_Gfx[]; -extern const u32 gRaySceneClouds_Pal[]; -extern const u32 gRaySceneClouds2_Tilemap[]; -extern const u32 gRaySceneClouds1_Tilemap[]; -extern const u32 gRaySceneClouds3_Tilemap[]; -extern const u32 gRaySceneRayquazaLight_Gfx[]; -extern const u32 gRaySceneRayquazaLight_Tilemap[]; -extern const u32 gRaySceneOvercast2_Gfx[]; -extern const u32 gRaySceneOvercast2_Tilemap[]; -extern const u32 gRaySceneOvercast2_Pal[]; -extern const u32 gRaySceneRayquazaChase_Gfx[]; -extern const u32 gRaySceneChaseStreaks_Gfx[]; -extern const u32 gRaySceneChaseBg_Gfx[]; -extern const u32 gRayChaseRayquazaChase2_Tilemap[]; -extern const u32 gRayChaseRayquazaChase_Tilemap[]; -extern const u32 gRaySceneChaseStreaks_Tilemap[]; -extern const u32 gRaySceneChaseBg_Tilemap[]; -extern const u32 gRaySceneChase_Pal[]; -extern const u32 gRaySceneHushRing_Tilemap[]; -extern const u32 gRaySceneHushBg_Tilemap[]; -extern const u32 gRaySceneHushRing_Map[]; -extern const u32 gRaySceneHushBg_Pal[]; -extern const u32 gRaySceneHushBg_Gfx[]; -extern const u32 gRaySceneHushRing_Gfx[]; +extern const u32 gRaySceneDuoFight_Groudon_Gfx[]; +extern const u32 gRaySceneDuoFight_GroudonShoulder_Gfx[]; +extern const u32 gRaySceneDuoFight_GroudonClaw_Gfx[]; +extern const u32 gRaySceneDuoFight_Kyogre_Gfx[]; +extern const u32 gRaySceneDuoFight_KyogrePectoralFin_Gfx[]; +extern const u32 gRaySceneDuoFight_KyogreDorsalFin_Gfx[]; +extern const u32 gRaySceneDuoFight_Groudon_Pal[]; +extern const u32 gRaySceneDuoFight_Kyogre_Pal[]; +extern const u32 gRaySceneDuoFight_Clouds_Gfx[]; +extern const u32 gRaySceneDuoFight_Clouds_Pal[]; +extern const u32 gRaySceneDuoFight_Clouds1_Tilemap[]; +extern const u32 gRaySceneDuoFight_Clouds2_Tilemap[]; +extern const u32 gRaySceneDuoFight_Clouds3_Tilemap[]; +extern const u32 gRaySceneTakesFlight_Smoke_Gfx[]; +extern const u32 gRaySceneTakesFlight_Smoke_Pal[]; +extern const u32 gRaySceneTakesFlight_Rayquaza_Pal[]; +extern const u32 gRaySceneTakesFlight_Bg_Gfx[]; +extern const u32 gRaySceneTakesFlight_Bg_Tilemap[]; +extern const u32 gRaySceneTakesFlight_Rayquaza_Gfx[]; +extern const u32 gRaySceneTakesFlight_Rayquaza_Tilemap[]; +extern const u32 gRaySceneDescends_Rayquaza_Gfx[]; +extern const u32 gRaySceneDescends_RayquazaTail_Gfx[]; +extern const u32 gRaySceneDescends_Light_Gfx[]; +extern const u32 gRaySceneDescends_Light_Tilemap[]; +extern const u32 gRaySceneDescends_Bg_Gfx[]; +extern const u32 gRaySceneDescends_Bg_Tilemap[]; +extern const u32 gRaySceneDescends_Bg_Pal[]; +extern const u32 gRaySceneCharges_Rayquaza_Gfx[]; +extern const u32 gRaySceneCharges_Streaks_Gfx[]; +extern const u32 gRaySceneCharges_Bg_Gfx[]; +extern const u32 gRaySceneCharges_Orbs_Tilemap[]; +extern const u32 gRaySceneCharges_Rayquaza_Tilemap[]; +extern const u32 gRaySceneCharges_Streaks_Tilemap[]; +extern const u32 gRaySceneCharges_Bg_Tilemap[]; +extern const u32 gRaySceneCharges_Bg_Pal[]; +extern const u32 gRaySceneChasesAway_Groudon_Gfx[]; +extern const u32 gRaySceneChasesAway_GroudonTail_Gfx[]; +extern const u32 gRaySceneChasesAway_Kyogre_Gfx[]; +extern const u32 gRaySceneChasesAway_Rayquaza_Gfx[]; +extern const u32 gRaySceneChasesAway_RayquazaTail_Gfx[]; +extern const u32 gRaySceneChasesAway_KyogreSplash_Gfx[]; +extern const u32 gRaySceneChasesAway_Groudon_Pal[]; +extern const u32 gRaySceneChasesAway_Kyogre_Pal[]; +extern const u32 gRaySceneChasesAway_Rayquaza_Pal[]; +extern const u32 gRaySceneChasesAway_KyogreSplash_Pal[]; +extern const u32 gRaySceneChasesAway_Bg_Tilemap[]; +extern const u32 gRaySceneChasesAway_Light_Tilemap[]; +extern const u32 gRaySceneChasesAway_Ring_Tilemap[]; +extern const u32 gRaySceneChasesAway_Bg_Pal[]; +extern const u32 gRaySceneChasesAway_Light_Gfx[]; +extern const u32 gRaySceneChasesAway_Ring_Gfx[]; // Pokeballs extern const u32 gItemIcon_MasterBall[]; @@ -6995,16 +6996,16 @@ extern const u16 gUsePokeblockGraph_Pal[]; extern const u16 gUsePokeblockNatureWin_Pal[]; // Berry blender -extern const u32 gBerryBlenderArrowTiles[]; -extern const u32 gBerryBlenderStartTiles[]; -extern const u32 gBerryBlenderMarubatsuTiles[]; -extern const u32 gBerryBlenderParticlesTiles[]; -extern const u32 gBerryBlenderCountdownNumbersTiles[]; +extern const u32 gBerryBlenderPlayerArrow_Gfx[]; +extern const u32 gBerryBlenderStart_Gfx[]; +extern const u32 gBerryBlenderScoreSymbols_Gfx[]; +extern const u32 gBerryBlenderParticles_Gfx[]; +extern const u32 gBerryBlenderCountdownNumbers_Gfx[]; extern const u16 gBerryBlenderMiscPalette[]; extern const u16 gBerryBlenderArrowPalette[]; -extern const u32 sBlenderCenterGfx[]; -extern const u32 gUnknown_08D91DB8[]; -extern const u32 gUnknown_08D927EC[]; +extern const u32 gBerryBlenderCenter_Gfx[]; +extern const u32 gBerryBlenderOuter_Gfx[]; +extern const u32 gBerryBlenderOuter_Tilemap[]; // Slot Machine extern const u32 gSlotMachineDigitalDisplay_Gfx[]; @@ -7076,11 +7077,11 @@ extern const u32 gWallpaperTilemap_Horizontal[]; extern const u16 gWallpaperPalettes_Horizontal[][16]; // Cable Car -extern const u32 gUnknown_08DBA5B8[]; -extern const u16 gUnknown_08DBA518[]; +extern const u32 gCableCarBg_Gfx[]; +extern const u16 gCableCarBg_Pal[]; extern const u32 gCableCar_Gfx[]; extern const u32 gCableCarDoor_Gfx[]; -extern const u32 gCableCarCord_Gfx[]; +extern const u32 gCableCarCable_Gfx[]; extern const u16 gCableCar_Pal[]; // Trade diff --git a/include/item_menu.h b/include/item_menu.h index edfb986f7f..a99272b0ca 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -93,7 +93,7 @@ void CB2_GoToSellMenu(void); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); -void ChooseBerrySetCallback(void (*callback)(void)); +void ChooseBerryForMachine(void (*exitCallback)(void)); void CB2_ChooseBerry(void); void Task_FadeAndCloseBagMenu(u8 taskId); void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index 75e9100d2d..e061149fc5 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -19,7 +19,7 @@ void sub_80D4FC8(u8 arg0); void sub_80D4FEC(u8 arg0); u8 CreateBerryTagSprite(u8 id, s16 x, s16 y); void FreeBerryTagSpritePalette(void); -u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine); +u8 CreateSpinningBerrySprite(u8 berryId, u8 x, u8 y, bool8 startAffine); u8 CreateBerryFlavorCircleSprite(s16 x); #define TAG_BAG_GFX 100 diff --git a/include/link.h b/include/link.h index de10bb8dcf..086bf787b4 100644 --- a/include/link.h +++ b/include/link.h @@ -48,52 +48,60 @@ #define EXTRACT_LINK_ERRORS(status) \ (((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT) -#define LINKCMD_SEND_LINK_TYPE 0x2222 -#define LINKCMD_READY_EXIT_STANDBY 0x2FFE -#define LINKCMD_SEND_HELD_KEYS 0x4444 -#define LINKCMD_0x5555 0x5555 -#define LINKCMD_0x5566 0x5566 -#define LINKCMD_READY_CLOSE_LINK 0x5FFF -#define LINKCMD_0x6666 0x6666 -#define LINKCMD_0x7777 0x7777 -#define LINKCMD_CONT_BLOCK 0x8888 -#define LINKCMD_0xAAAA 0xAAAA -#define LINKCMD_0xAAAB 0xAAAB -#define LINKCMD_READY_TO_TRADE 0xAABB -#define LINKCMD_READY_FINISH_TRADE 0xABCD -#define LINKCMD_INIT_BLOCK 0xBBBB -#define LINKCMD_READY_CANCEL_TRADE 0xBBCC -#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE -#define LINKCMD_SEND_BLOCK_REQ 0xCCCC -#define LINKCMD_START_TRADE 0xCCDD -#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA -#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD -#define LINKCMD_0xDDEE 0xDDEE -#define LINKCMD_REQUEST_CANCEL 0xEEAA -#define LINKCMD_CANCEL_TRADE 0xEEBB -#define LINKCMD_0xEECC 0xEECC +#define LINKCMD_BLENDER_STOP 0x1111 +#define LINKCMD_SEND_LINK_TYPE 0x2222 +#define LINKCMD_BLENDER_SCORE_MISS 0x2345 +#define LINKCMD_READY_EXIT_STANDBY 0x2FFE +#define LINKCMD_SEND_PACKET 0x2FFF +#define LINKCMD_BLENDER_SEND_KEYS 0x4444 +#define LINKCMD_BLENDER_SCORE_BEST 0x4523 +#define LINKCMD_BLENDER_SCORE_GOOD 0x5432 +#define LINKCMD_0x5555 0x5555 +#define LINKCMD_0x5566 0x5566 +#define LINKCMD_READY_CLOSE_LINK 0x5FFF +#define LINKCMD_0x6666 0x6666 +#define LINKCMD_0x7777 0x7777 +#define LINKCMD_BLENDER_PLAY_AGAIN 0x7779 +#define LINKCMD_0x7FFF 0x7FFF +#define LINKCMD_CONT_BLOCK 0x8888 +#define LINKCMD_BLENDER_NO_BERRIES 0x9999 +#define LINKCMD_BLENDER_NO_PBLOCK_SPACE 0xAAAA +#define LINKCMD_0xAAAB 0xAAAB +#define LINKCMD_READY_TO_TRADE 0xAABB +#define LINKCMD_READY_FINISH_TRADE 0xABCD +#define LINKCMD_INIT_BLOCK 0xBBBB +#define LINKCMD_READY_CANCEL_TRADE 0xBBCC +#define LINKCMD_SEND_HELD_KEYS 0xCAFE +#define LINKCMD_SEND_BLOCK_REQ 0xCCCC +#define LINKCMD_START_TRADE 0xCCDD +#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA +#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD +#define LINKCMD_0xDDEE 0xDDEE +#define LINKCMD_REQUEST_CANCEL 0xEEAA +#define LINKCMD_CANCEL_TRADE 0xEEBB +#define LINKCMD_0xEECC 0xEECC -#define LINKTYPE_TRADE 0x1111 -#define LINKTYPE_TRADE_CONNECTING 0x1122 -#define LINKTYPE_TRADE_SETUP 0x1133 -#define LINKTYPE_TRADE_DISCONNECTED 0x1144 -#define LINKTYPE_BATTLE 0x2211 -#define LINKTYPE_0x2222 0x2222 // unused battle? -#define LINKTYPE_SINGLE_BATTLE 0x2233 -#define LINKTYPE_DOUBLE_BATTLE 0x2244 -#define LINKTYPE_MULTI_BATTLE 0x2255 -#define LINKTYPE_BATTLE_TOWER_50 0x2266 -#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277 -#define LINKTYPE_BATTLE_TOWER 0x2288 -#define LINKTYPE_RECORD_MIX_BEFORE 0x3311 -#define LINKTYPE_RECORD_MIX_AFTER 0x3322 -#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 -#define LINKTYPE_BERRY_BLENDER 0x4422 -#define LINKTYPE_MYSTERY_EVENT 0x5501 -#define LINKTYPE_0x5502 0x5502 // unused? -#define LINKTYPE_EREADER 0x5503 -#define LINKTYPE_CONTEST_GMODE 0x6601 -#define LINKTYPE_CONTEST_EMODE 0x6602 +#define LINKTYPE_TRADE 0x1111 +#define LINKTYPE_TRADE_CONNECTING 0x1122 +#define LINKTYPE_TRADE_SETUP 0x1133 +#define LINKTYPE_TRADE_DISCONNECTED 0x1144 +#define LINKTYPE_BATTLE 0x2211 +#define LINKTYPE_0x2222 0x2222 // unused battle? +#define LINKTYPE_SINGLE_BATTLE 0x2233 +#define LINKTYPE_DOUBLE_BATTLE 0x2244 +#define LINKTYPE_MULTI_BATTLE 0x2255 +#define LINKTYPE_BATTLE_TOWER_50 0x2266 +#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277 +#define LINKTYPE_BATTLE_TOWER 0x2288 +#define LINKTYPE_RECORD_MIX_BEFORE 0x3311 +#define LINKTYPE_RECORD_MIX_AFTER 0x3322 +#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 +#define LINKTYPE_BERRY_BLENDER 0x4422 +#define LINKTYPE_MYSTERY_EVENT 0x5501 +#define LINKTYPE_0x5502 0x5502 // unused? +#define LINKTYPE_EREADER 0x5503 +#define LINKTYPE_CONTEST_GMODE 0x6601 +#define LINKTYPE_CONTEST_EMODE 0x6602 struct LinkStatus { @@ -230,7 +238,7 @@ extern u16 gSendCmd[CMD_LENGTH]; extern struct LinkPlayer gLinkPlayers[5]; extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; -extern u32 gUnknown_020223C0; +extern u32 gBerryBlenderKeySendAttempts; extern bool8 gLinkVSyncDisabled; extern u32 gLinkStatus; @@ -280,7 +288,7 @@ u8 IsLinkMaster(void); void SetCloseLinkCallback(void); bool8 HandleLinkConnection(void); void SetLinkDebugValues(u32 seed, u32 flags); -void sub_800A418(void); +void SetBerryBlenderLinkCallback(void); void SetSuppressLinkErrorMessage(bool8 flag); void sub_800B524(struct LinkPlayer *linkPlayer); u8 GetSioMultiSI(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index 4d00039eb9..9476da6b7d 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -5,18 +5,18 @@ #include "link.h" #include "AgbRfu_LinkManager.h" -#define RFU_COMMAND_0x4400 0x4400 -#define RFU_COMMAND_0x8800 0x8800 -#define RFU_COMMAND_0x8900 0x8900 -#define RFU_COMMAND_SEND_BLOCK_REQ 0xA100 -#define RFU_COMMAND_0x7700 0x7700 -#define RFU_COMMAND_0x7800 0x7800 -#define RFU_COMMAND_READY_EXIT_STANDBY 0x6600 -#define RFU_COMMAND_READY_CLOSE_LINK 0x5F00 -#define RFU_COMMAND_0x2F00 0x2F00 -#define RFU_COMMAND_0xBE00 0xBE00 -#define RFU_COMMAND_0xEE00 0xEE00 -#define RFU_COMMAND_0xED00 0xED00 +#define RFUCMD_SEND_PACKET 0x2F00 +#define RFUCMD_BLENDER_SEND_KEYS 0x4400 +#define RFUCMD_READY_CLOSE_LINK 0x5F00 +#define RFUCMD_READY_EXIT_STANDBY 0x6600 +#define RFUCMD_0x7700 0x7700 +#define RFUCMD_0x7800 0x7800 +#define RFUCMD_0x8800 0x8800 +#define RFUCMD_0x8900 0x8900 +#define RFUCMD_SEND_BLOCK_REQ 0xA100 +#define RFUCMD_SEND_HELD_KEYS 0xBE00 +#define RFUCMD_0xED00 0xED00 +#define RFUCMD_0xEE00 0xEE00 #define RFU_SERIAL_7F7D 0x7F7D @@ -29,6 +29,8 @@ #define BACKUP_QUEUE_NUM_SLOTS 2 #define BACKUP_QUEUE_SLOT_LENGTH 14 +#define RFU_PACKET_SIZE 6 + #define RFU_STATUS_OK 0 #define RFU_STATUS_FATAL_ERROR 1 #define RFU_STATUS_CONNECTION_ERROR 2 @@ -140,7 +142,7 @@ struct GFRfuManager /* 0x0ef */ bool8 isShuttingDown; /* 0x0f0 */ u8 linkLossRecoveryState; /* 0x0f1 */ u8 status; - /* 0x0f2 */ u16 unk_f2[6]; + /* 0x0f2 */ u16 packet[RFU_PACKET_SIZE]; /* 0x0fe */ u16 resendExitStandbyTimer; /* 0x100 */ u16 unk_100; /* 0x102 */ u8 unk_102; @@ -197,7 +199,7 @@ void Rfu_SetBlockReceivedFlag(u8 who); void Rfu_ResetBlockReceivedFlag(u8 who); bool32 IsSendingKeysToRfu(void); void StartSendingKeysToRfu(void); -void sub_800F850(void); +void Rfu_SetBerryBlenderLinkCallback(void); u8 Rfu_GetBlockReceivedStatus(void); bool32 Rfu_InitBlockSend(const u8 *src, size_t size); void ClearLinkRfuCallback(void); @@ -250,7 +252,7 @@ void SetTradeBoardRegisteredMonInfo(u32 type, u32 species, u32 level); void InitializeRfuLinkManager_EnterUnionRoom(void); void sub_8012188(const u8 *name, struct GFtgtGname *structPtr, u8 a2); bool32 IsUnionRoomListenTaskActive(void); -void sub_800FE50(void *a0); +void Rfu_SendPacket(void *data); bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(s32 a0); diff --git a/include/list_menu.h b/include/list_menu.h index 0a54a069ad..4697ba5aa6 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -24,7 +24,7 @@ struct ListMenu; struct ListMenuItem { const u8 *name; - s32 id; + u32 id; }; struct ListMenuTemplate @@ -98,7 +98,7 @@ struct CursorStruct extern struct ScrollArrowsTemplate gTempScrollArrowTemplate; extern struct ListMenuTemplate gMultiuseListMenuTemplate; -s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); +u32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow); s32 ListMenu_ProcessInput(u8 listTaskId); diff --git a/include/menu.h b/include/menu.h index a57b3718f6..1bd8007426 100644 --- a/include/menu.h +++ b/include/menu.h @@ -8,6 +8,12 @@ #define MENU_NOTHING_CHOSEN -2 #define MENU_B_PRESSED -1 +#define MENU_CURSOR_DELTA_NONE 0 +#define MENU_CURSOR_DELTA_UP -1 +#define MENU_CURSOR_DELTA_DOWN 1 +#define MENU_CURSOR_DELTA_LEFT -1 +#define MENU_CURSOR_DELTA_RIGHT 1 + enum { SAVE_MENU_NAME, @@ -77,7 +83,7 @@ void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8); void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8); u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCursorPos); -u8 sub_8199134(s8, s8); +u8 ChangeListMenuCursorPosition(s8 deltaX, s8 deltaY); u8 GetStartMenuWindowId(void); void ListMenuLoadStdPalAt(u8, u8); u8 Menu_MoveCursor(s8 cursorDelta); diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index b5dae6de09..d4bd9e6832 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -99,10 +99,10 @@ bool8 MetatileBehavior_IsShortGrass(u8); bool8 MetatileBehavior_IsHotSprings(u8); bool8 MetatileBehavior_IsWaterfall(u8); bool8 MetatileBehavior_IsFortreeBridge(u8); -bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8); -bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8); -bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8); -bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8); +bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8); +bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8); +bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8); +bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8); bool8 MetatileBehavior_IsPacifidlogLog(u8); bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8); bool8 MetatileBehavior_IsRegionMap(u8); diff --git a/include/palette.h b/include/palette.h index 8d16270aa3..f874bcd74a 100644 --- a/include/palette.h +++ b/include/palette.h @@ -70,7 +70,7 @@ void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color); void BlendPalettesUnfaded(u32, u8, u16); -void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7); +void BlendPalettesGradually(u32 selectedPalettes, s8 delay, u8 coeff, u8 coeffTarget, u16 color, u8 priority, u8 id); void TintPalette_GrayScale(u16 *palette, u16 count); void TintPalette_GrayScale2(u16 *palette, u16 count); void TintPalette_SepiaTone(u16 *palette, u16 count); diff --git a/include/pokeball.h b/include/pokeball.h index 12b9b1eff8..1cdb08f94b 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -18,6 +18,14 @@ enum POKEBALL_COUNT }; +enum { + BALL_AFFINE_ANIM_0, + BALL_ROTATE_RIGHT, + BALL_ROTATE_LEFT, + BALL_AFFINE_ANIM_3, + BALL_AFFINE_ANIM_4 +}; + extern const struct SpriteTemplate gBallSpriteTemplates[]; #define POKEBALL_PLAYER_SENDOUT 0xFF diff --git a/include/pokeblock.h b/include/pokeblock.h index 0d413a810b..c82e99d8fb 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -9,12 +9,21 @@ enum { - PBLOCK_CLR_BLACK, + PBLOCK_CLR_NONE, PBLOCK_CLR_RED, PBLOCK_CLR_BLUE, PBLOCK_CLR_PINK, PBLOCK_CLR_GREEN, - PBLOCK_CLR_YELLOW + PBLOCK_CLR_YELLOW, + PBLOCK_CLR_PURPLE, + PBLOCK_CLR_INDIGO, + PBLOCK_CLR_BROWN, + PBLOCK_CLR_LITE_BLUE, + PBLOCK_CLR_OLIVE, + PBLOCK_CLR_GRAY, + PBLOCK_CLR_BLACK, + PBLOCK_CLR_WHITE, + PBLOCK_CLR_GOLD, }; enum diff --git a/include/pokenav.h b/include/pokenav.h index ac916f3ba8..ed4e5a9061 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -313,7 +313,7 @@ bool32 WaitForHelpBar(void); void sub_81C78A0(void); bool32 MainMenuLoopedTaskIsBusy(void); void sub_81C7FDC(void); -void sub_81C79BC(const u16 *a0, const u16 *a1, u32 a2, u32 a3, u32 a4, u16 *a5); +void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette); void sub_81C7B40(void); struct Sprite *PauseSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void); diff --git a/include/rayquaza_scene.h b/include/rayquaza_scene.h index fe66b3df06..5aa21981eb 100644 --- a/include/rayquaza_scene.h +++ b/include/rayquaza_scene.h @@ -1,17 +1,6 @@ #ifndef GUARD_RAYQUAZA_SCENE_H #define GUARD_RAYQUAZA_SCENE_H -void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void)); - -enum -{ - RAY_ANIM_DUO_FIGHT_PRE, - RAY_ANIM_DUO_FIGHT, - RAY_ANIM_TAKES_FLIGHT, - RAY_ANIM_DESCENDS, - RAY_ANIM_CHARGES, - RAY_ANIM_CHACES_AWAY, - RAY_ANIM_END -}; +void DoRayquazaScene(u8 animId, bool8 endEarly, void (*callback)(void)); #endif // GUARD_RAYQUAZA_SCENE_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h deleted file mode 100644 index ee73973201..0000000000 --- a/include/rom_8011DC0.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef GUARD_rom_8011DC0_H -#define GUARD_rom_8011DC0_H - -#endif //GUARD_rom_8011DC0_H diff --git a/include/strings.h b/include/strings.h index 1f2920140e..7018f9e0d3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2983,4 +2983,9 @@ extern const u8 gText_Smartness[]; extern const u8 gText_Cuteness[]; extern const u8 gText_Beauty3[]; +// Berry Blender +extern const u8 gText_SavingDontTurnOff2[]; +extern const u8 gText_BlenderMaxSpeedRecord[]; +extern const u8 gText_234Players[]; + #endif // GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 4a2233fb79..0b878cee4e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -252,7 +252,7 @@ SECTIONS { src/intro.o(.text); src/reset_save_heap.o(.text); src/field_region_map.o(.text); - src/battle_anim_special.o(.text); + src/battle_anim_throw.o(.text); src/hall_of_fame.o(.text); src/credits.o(.text); src/lottery_corner.o(.text); @@ -610,7 +610,7 @@ SECTIONS { src/player_pc.o(.rodata); src/intro.o(.rodata); src/field_region_map.o(.rodata); - src/battle_anim_special.o(.rodata); + src/battle_anim_throw.o(.rodata); src/hall_of_fame.o(.rodata); src/credits.o(.rodata); src/lottery_corner.o(.rodata); @@ -692,7 +692,7 @@ SECTIONS { ALIGN(4) { sound/songs/midi/mus_dummy.o(.rodata); - sound/songs/midi/se_kaifuku.o(.rodata); + sound/songs/midi/se_use_item.o(.rodata); sound/songs/midi/se_pc_login.o(.rodata); sound/songs/midi/se_pc_off.o(.rodata); sound/songs/midi/se_pc_on.o(.rodata); @@ -700,476 +700,476 @@ SECTIONS { sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); sound/songs/midi/se_door.o(.rodata); - sound/songs/midi/se_kaidan.o(.rodata); - sound/songs/midi/se_dansa.o(.rodata); - sound/songs/midi/se_jitensya.o(.rodata); - sound/songs/midi/se_kouka_l.o(.rodata); - sound/songs/midi/se_kouka_m.o(.rodata); - sound/songs/midi/se_kouka_h.o(.rodata); - sound/songs/midi/se_bowa2.o(.rodata); - sound/songs/midi/se_poke_dead.o(.rodata); - sound/songs/midi/se_nigeru.o(.rodata); - sound/songs/midi/se_jido_doa.o(.rodata); - sound/songs/midi/se_naminori.o(.rodata); - sound/songs/midi/se_ban.o(.rodata); + sound/songs/midi/se_exit.o(.rodata); + sound/songs/midi/se_ledge.o(.rodata); + sound/songs/midi/se_bike_bell.o(.rodata); + sound/songs/midi/se_not_effective.o(.rodata); + sound/songs/midi/se_effective.o(.rodata); + sound/songs/midi/se_super_effective.o(.rodata); + sound/songs/midi/se_ball_open.o(.rodata); + sound/songs/midi/se_faint.o(.rodata); + sound/songs/midi/se_flee.o(.rodata); + sound/songs/midi/se_sliding_door.o(.rodata); + sound/songs/midi/se_ship.o(.rodata); + sound/songs/midi/se_bang.o(.rodata); sound/songs/midi/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); - sound/songs/midi/se_bowa.o(.rodata); - sound/songs/midi/se_jyuni.o(.rodata); + sound/songs/midi/se_ball.o(.rodata); + sound/songs/midi/se_contest_place.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/midi/se_i.o(.rodata); sound/songs/midi/se_u.o(.rodata); sound/songs/midi/se_e.o(.rodata); sound/songs/midi/se_o.o(.rodata); sound/songs/midi/se_n.o(.rodata); - sound/songs/midi/se_seikai.o(.rodata); - sound/songs/midi/se_hazure.o(.rodata); + sound/songs/midi/se_success.o(.rodata); + sound/songs/midi/se_failure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); - sound/songs/midi/se_jite_pyoko.o(.rodata); - sound/songs/midi/se_mu_pachi.o(.rodata); - sound/songs/midi/se_tk_kasya.o(.rodata); + sound/songs/midi/se_bike_hop.o(.rodata); + sound/songs/midi/se_switch.o(.rodata); + sound/songs/midi/se_click.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); - sound/songs/midi/se_fu_zaku2.o(.rodata); - sound/songs/midi/se_fu_zuzuzu.o(.rodata); - sound/songs/midi/se_ru_gashin.o(.rodata); - sound/songs/midi/se_ru_gasyan.o(.rodata); - sound/songs/midi/se_ru_bari.o(.rodata); - sound/songs/midi/se_ru_hyuu.o(.rodata); - sound/songs/midi/se_ki_gasyan.o(.rodata); - sound/songs/midi/se_tk_warpin.o(.rodata); - sound/songs/midi/se_tk_warpout.o(.rodata); - sound/songs/midi/se_tu_saa.o(.rodata); - sound/songs/midi/se_hi_turun.o(.rodata); - sound/songs/midi/se_track_move.o(.rodata); - sound/songs/midi/se_track_stop.o(.rodata); - sound/songs/midi/se_track_haiki.o(.rodata); - sound/songs/midi/se_track_door.o(.rodata); - sound/songs/midi/se_moter.o(.rodata); + sound/songs/midi/se_contest_condition_lose.o(.rodata); + sound/songs/midi/se_lavaridge_fall_warp.o(.rodata); + sound/songs/midi/se_ice_stairs.o(.rodata); + sound/songs/midi/se_ice_break.o(.rodata); + sound/songs/midi/se_ice_crack.o(.rodata); + sound/songs/midi/se_fall.o(.rodata); + sound/songs/midi/se_unlock.o(.rodata); + sound/songs/midi/se_warp_in.o(.rodata); + sound/songs/midi/se_warp_out.o(.rodata); + sound/songs/midi/se_repel.o(.rodata); + sound/songs/midi/se_rotating_gate.o(.rodata); + sound/songs/midi/se_truck_move.o(.rodata); + sound/songs/midi/se_truck_stop.o(.rodata); + sound/songs/midi/se_truck_unload.o(.rodata); + sound/songs/midi/se_truck_door.o(.rodata); + sound/songs/midi/se_berry_blender.o(.rodata); sound/songs/midi/se_card.o(.rodata); sound/songs/midi/se_save.o(.rodata); - sound/songs/midi/se_kon.o(.rodata); - sound/songs/midi/se_kon2.o(.rodata); - sound/songs/midi/se_kon3.o(.rodata); - sound/songs/midi/se_kon4.o(.rodata); - sound/songs/midi/se_suikomu.o(.rodata); - sound/songs/midi/se_nageru.o(.rodata); - sound/songs/midi/se_toy_c.o(.rodata); - sound/songs/midi/se_toy_d.o(.rodata); - sound/songs/midi/se_toy_e.o(.rodata); - sound/songs/midi/se_toy_f.o(.rodata); - sound/songs/midi/se_toy_g.o(.rodata); - sound/songs/midi/se_toy_a.o(.rodata); - sound/songs/midi/se_toy_b.o(.rodata); - sound/songs/midi/se_toy_c1.o(.rodata); - sound/songs/midi/se_mizu.o(.rodata); - sound/songs/midi/se_hashi.o(.rodata); - sound/songs/midi/se_daugi.o(.rodata); - sound/songs/midi/se_pinpon.o(.rodata); - sound/songs/midi/se_fuusen1.o(.rodata); - sound/songs/midi/se_fuusen2.o(.rodata); - sound/songs/midi/se_fuusen3.o(.rodata); - sound/songs/midi/se_toy_kabe.o(.rodata); - sound/songs/midi/se_toy_dango.o(.rodata); - sound/songs/midi/se_doku.o(.rodata); - sound/songs/midi/se_esuka.o(.rodata); - sound/songs/midi/se_t_ame.o(.rodata); - sound/songs/midi/se_t_ame_e.o(.rodata); - sound/songs/midi/se_t_ooame.o(.rodata); - sound/songs/midi/se_t_ooame_e.o(.rodata); - sound/songs/midi/se_t_koame.o(.rodata); - sound/songs/midi/se_t_koame_e.o(.rodata); - sound/songs/midi/se_t_kami.o(.rodata); - sound/songs/midi/se_t_kami2.o(.rodata); - sound/songs/midi/se_elebeta.o(.rodata); - sound/songs/midi/se_hinsi.o(.rodata); - sound/songs/midi/se_expmax.o(.rodata); - sound/songs/midi/se_tamakoro.o(.rodata); - sound/songs/midi/se_tamakoro_e.o(.rodata); - sound/songs/midi/se_basabasa.o(.rodata); - sound/songs/midi/se_regi.o(.rodata); - sound/songs/midi/se_c_gaji.o(.rodata); - sound/songs/midi/se_c_maku_u.o(.rodata); - sound/songs/midi/se_c_maku_d.o(.rodata); - sound/songs/midi/se_c_pasi.o(.rodata); - sound/songs/midi/se_c_syu.o(.rodata); - sound/songs/midi/se_c_pikon.o(.rodata); - sound/songs/midi/se_reapoke.o(.rodata); - sound/songs/midi/se_op_basyu.o(.rodata); - sound/songs/midi/se_bt_start.o(.rodata); - sound/songs/midi/se_dendou.o(.rodata); - sound/songs/midi/se_jihanki.o(.rodata); - sound/songs/midi/se_tama.o(.rodata); - sound/songs/se_z_scroll.o(.rodata); - sound/songs/se_z_page.o(.rodata); - sound/songs/midi/se_pn_on.o(.rodata); - sound/songs/midi/se_pn_off.o(.rodata); - sound/songs/midi/se_z_search.o(.rodata); - sound/songs/midi/se_tamago.o(.rodata); - sound/songs/midi/se_tb_start.o(.rodata); - sound/songs/midi/se_tb_kon.o(.rodata); - sound/songs/midi/se_tb_kara.o(.rodata); - sound/songs/midi/se_bidoro.o(.rodata); - sound/songs/se_w085.o(.rodata); - sound/songs/se_w085b.o(.rodata); - sound/songs/se_w231.o(.rodata); - sound/songs/se_w171.o(.rodata); - sound/songs/se_w233.o(.rodata); - sound/songs/se_w233b.o(.rodata); - sound/songs/se_w145.o(.rodata); - sound/songs/se_w145b.o(.rodata); - sound/songs/se_w145c.o(.rodata); - sound/songs/se_w240.o(.rodata); - sound/songs/midi/se_w015.o(.rodata); - sound/songs/se_w081.o(.rodata); - sound/songs/se_w081b.o(.rodata); - sound/songs/se_w088.o(.rodata); - sound/songs/midi/se_w016.o(.rodata); - sound/songs/midi/se_w016b.o(.rodata); - sound/songs/midi/se_w003.o(.rodata); - sound/songs/se_w104.o(.rodata); - sound/songs/midi/se_w013.o(.rodata); - sound/songs/se_w196.o(.rodata); - sound/songs/se_w086.o(.rodata); - sound/songs/midi/se_w004.o(.rodata); - sound/songs/midi/se_w025.o(.rodata); - sound/songs/midi/se_w025b.o(.rodata); - sound/songs/se_w152.o(.rodata); - sound/songs/midi/se_w026.o(.rodata); - sound/songs/se_w172.o(.rodata); - sound/songs/se_w172b.o(.rodata); - sound/songs/se_w053.o(.rodata); - sound/songs/midi/se_w007.o(.rodata); - sound/songs/se_w092.o(.rodata); - sound/songs/se_w221.o(.rodata); - sound/songs/se_w221b.o(.rodata); - sound/songs/se_w052.o(.rodata); - sound/songs/midi/se_w036.o(.rodata); - sound/songs/se_w059.o(.rodata); - sound/songs/se_w059b.o(.rodata); - sound/songs/midi/se_w010.o(.rodata); - sound/songs/midi/se_w011.o(.rodata); - sound/songs/midi/se_w017.o(.rodata); - sound/songs/midi/se_w019.o(.rodata); - sound/songs/midi/se_w028.o(.rodata); - sound/songs/midi/se_w013b.o(.rodata); - sound/songs/se_w044.o(.rodata); - sound/songs/midi/se_w029.o(.rodata); - sound/songs/se_w057.o(.rodata); - sound/songs/se_w056.o(.rodata); - sound/songs/se_w250.o(.rodata); - sound/songs/midi/se_w030.o(.rodata); - sound/songs/midi/se_w039.o(.rodata); - sound/songs/se_w054.o(.rodata); - sound/songs/se_w077.o(.rodata); - sound/songs/midi/se_w020.o(.rodata); - sound/songs/se_w082.o(.rodata); - sound/songs/se_w047.o(.rodata); - sound/songs/se_w195.o(.rodata); - sound/songs/midi/se_w006.o(.rodata); - sound/songs/se_w091.o(.rodata); - sound/songs/se_w146.o(.rodata); - sound/songs/se_w120.o(.rodata); - sound/songs/se_w153.o(.rodata); - sound/songs/se_w071b.o(.rodata); - sound/songs/se_w071.o(.rodata); - sound/songs/se_w103.o(.rodata); - sound/songs/se_w062.o(.rodata); - sound/songs/se_w062b.o(.rodata); - sound/songs/se_w048.o(.rodata); - sound/songs/se_w187.o(.rodata); - sound/songs/se_w118.o(.rodata); - sound/songs/se_w155.o(.rodata); - sound/songs/se_w122.o(.rodata); - sound/songs/se_w060.o(.rodata); - sound/songs/se_w185.o(.rodata); - sound/songs/midi/se_w014.o(.rodata); - sound/songs/midi/se_w043.o(.rodata); - sound/songs/se_w207.o(.rodata); - sound/songs/se_w207b.o(.rodata); - sound/songs/se_w215.o(.rodata); - sound/songs/se_w109.o(.rodata); - sound/songs/se_w173.o(.rodata); - sound/songs/se_w280.o(.rodata); - sound/songs/se_w202.o(.rodata); - sound/songs/se_w060b.o(.rodata); - sound/songs/se_w076.o(.rodata); - sound/songs/se_w080.o(.rodata); - sound/songs/se_w100.o(.rodata); - sound/songs/se_w107.o(.rodata); - sound/songs/se_w166.o(.rodata); - sound/songs/se_w129.o(.rodata); - sound/songs/se_w115.o(.rodata); - sound/songs/se_w112.o(.rodata); - sound/songs/se_w197.o(.rodata); - sound/songs/se_w199.o(.rodata); - sound/songs/se_w236.o(.rodata); - sound/songs/se_w204.o(.rodata); - sound/songs/se_w268.o(.rodata); - sound/songs/se_w070.o(.rodata); - sound/songs/se_w063.o(.rodata); - sound/songs/se_w127.o(.rodata); - sound/songs/se_w179.o(.rodata); - sound/songs/se_w151.o(.rodata); - sound/songs/se_w201.o(.rodata); - sound/songs/se_w161.o(.rodata); - sound/songs/se_w161b.o(.rodata); - sound/songs/se_w227.o(.rodata); - sound/songs/se_w227b.o(.rodata); - sound/songs/se_w226.o(.rodata); - sound/songs/se_w208.o(.rodata); - sound/songs/se_w213.o(.rodata); - sound/songs/se_w213b.o(.rodata); - sound/songs/se_w234.o(.rodata); - sound/songs/se_w260.o(.rodata); - sound/songs/se_w328.o(.rodata); - sound/songs/se_w320.o(.rodata); - sound/songs/se_w255.o(.rodata); - sound/songs/se_w291.o(.rodata); - sound/songs/se_w089.o(.rodata); - sound/songs/se_w239.o(.rodata); - sound/songs/se_w230.o(.rodata); - sound/songs/se_w281.o(.rodata); - sound/songs/se_w327.o(.rodata); - sound/songs/se_w287.o(.rodata); - sound/songs/se_w257.o(.rodata); - sound/songs/se_w253.o(.rodata); - sound/songs/se_w258.o(.rodata); - sound/songs/se_w322.o(.rodata); - sound/songs/se_w298.o(.rodata); - sound/songs/se_w287b.o(.rodata); - sound/songs/se_w114.o(.rodata); - sound/songs/se_w063b.o(.rodata); - sound/songs/midi/se_rg_w_door.o(.rodata); - sound/songs/midi/se_rg_card1.o(.rodata); - sound/songs/midi/se_rg_card2.o(.rodata); - sound/songs/midi/se_rg_card3.o(.rodata); - sound/songs/midi/se_rg_bag1.o(.rodata); - sound/songs/midi/se_rg_bag2.o(.rodata); - sound/songs/midi/se_rg_getting.o(.rodata); + sound/songs/midi/se_ball_bounce_1.o(.rodata); + sound/songs/midi/se_ball_bounce_2.o(.rodata); + sound/songs/midi/se_ball_bounce_3.o(.rodata); + sound/songs/midi/se_ball_bounce_4.o(.rodata); + sound/songs/midi/se_ball_trade.o(.rodata); + sound/songs/midi/se_ball_throw.o(.rodata); + sound/songs/midi/se_note_c.o(.rodata); + sound/songs/midi/se_note_d.o(.rodata); + sound/songs/midi/se_note_e.o(.rodata); + sound/songs/midi/se_note_f.o(.rodata); + sound/songs/midi/se_note_g.o(.rodata); + sound/songs/midi/se_note_a.o(.rodata); + sound/songs/midi/se_note_b.o(.rodata); + sound/songs/midi/se_note_c_high.o(.rodata); + sound/songs/midi/se_puddle.o(.rodata); + sound/songs/midi/se_bridge_walk.o(.rodata); + sound/songs/midi/se_itemfinder.o(.rodata); + sound/songs/midi/se_ding_dong.o(.rodata); + sound/songs/midi/se_balloon_red.o(.rodata); + sound/songs/midi/se_balloon_blue.o(.rodata); + sound/songs/midi/se_balloon_yellow.o(.rodata); + sound/songs/midi/se_breakable_door.o(.rodata); + sound/songs/midi/se_mud_ball.o(.rodata); + sound/songs/midi/se_field_poison.o(.rodata); + sound/songs/midi/se_escalator.o(.rodata); + sound/songs/midi/se_thunderstorm.o(.rodata); + sound/songs/midi/se_thunderstorm_stop.o(.rodata); + sound/songs/midi/se_downpour.o(.rodata); + sound/songs/midi/se_downpour_stop.o(.rodata); + sound/songs/midi/se_rain.o(.rodata); + sound/songs/midi/se_rain_stop.o(.rodata); + sound/songs/midi/se_thunder.o(.rodata); + sound/songs/midi/se_thunder2.o(.rodata); + sound/songs/midi/se_elevator.o(.rodata); + sound/songs/midi/se_low_health.o(.rodata); + sound/songs/midi/se_exp_max.o(.rodata); + sound/songs/midi/se_roulette_ball.o(.rodata); + sound/songs/midi/se_roulette_ball2.o(.rodata); + sound/songs/midi/se_taillow_wing_flap.o(.rodata); + sound/songs/midi/se_shop.o(.rodata); + sound/songs/midi/se_contest_heart.o(.rodata); + sound/songs/midi/se_contest_curtain_rise.o(.rodata); + sound/songs/midi/se_contest_curtain_fall.o(.rodata); + sound/songs/midi/se_contest_icon_change.o(.rodata); + sound/songs/midi/se_contest_icon_clear.o(.rodata); + sound/songs/midi/se_contest_mons_turn.o(.rodata); + sound/songs/midi/se_shiny.o(.rodata); + sound/songs/midi/se_intro_blast.o(.rodata); + sound/songs/midi/se_mugshot.o(.rodata); + sound/songs/midi/se_applause.o(.rodata); + sound/songs/midi/se_vend.o(.rodata); + sound/songs/midi/se_orb.o(.rodata); + sound/songs/se_dex_scroll.o(.rodata); + sound/songs/se_dex_page.o(.rodata); + sound/songs/midi/se_pokenav_on.o(.rodata); + sound/songs/midi/se_pokenav_off.o(.rodata); + sound/songs/midi/se_dex_search.o(.rodata); + sound/songs/midi/se_egg_hatch.o(.rodata); + sound/songs/midi/se_ball_tray_enter.o(.rodata); + sound/songs/midi/se_ball_tray_ball.o(.rodata); + sound/songs/midi/se_ball_tray_exit.o(.rodata); + sound/songs/midi/se_glass_flute.o(.rodata); + sound/songs/se_m_thunderbolt.o(.rodata); + sound/songs/se_m_thunderbolt2.o(.rodata); + sound/songs/se_m_harden.o(.rodata); + sound/songs/se_m_nightmare.o(.rodata); + sound/songs/se_m_vital_throw.o(.rodata); + sound/songs/se_m_vital_throw2.o(.rodata); + sound/songs/se_m_bubble.o(.rodata); + sound/songs/se_m_bubble2.o(.rodata); + sound/songs/se_m_bubble3.o(.rodata); + sound/songs/se_m_rain_dance.o(.rodata); + sound/songs/midi/se_m_cut.o(.rodata); + sound/songs/se_m_string_shot.o(.rodata); + sound/songs/se_m_string_shot2.o(.rodata); + sound/songs/se_m_rock_throw.o(.rodata); + sound/songs/midi/se_m_gust.o(.rodata); + sound/songs/midi/se_m_gust2.o(.rodata); + sound/songs/midi/se_m_double_slap.o(.rodata); + sound/songs/se_m_double_team.o(.rodata); + sound/songs/midi/se_m_razor_wind.o(.rodata); + sound/songs/se_m_icy_wind.o(.rodata); + sound/songs/se_m_thunder_wave.o(.rodata); + sound/songs/midi/se_m_comet_punch.o(.rodata); + sound/songs/midi/se_m_mega_kick.o(.rodata); + sound/songs/midi/se_m_mega_kick2.o(.rodata); + sound/songs/se_m_crabhammer.o(.rodata); + sound/songs/midi/se_m_jump_kick.o(.rodata); + sound/songs/se_m_flame_wheel.o(.rodata); + sound/songs/se_m_flame_wheel2.o(.rodata); + sound/songs/se_m_flamethrower.o(.rodata); + sound/songs/midi/se_m_fire_punch.o(.rodata); + sound/songs/se_m_toxic.o(.rodata); + sound/songs/se_m_sacred_fire.o(.rodata); + sound/songs/se_m_sacred_fire2.o(.rodata); + sound/songs/se_m_ember.o(.rodata); + sound/songs/midi/se_m_take_down.o(.rodata); + sound/songs/se_m_blizzard.o(.rodata); + sound/songs/se_m_blizzard2.o(.rodata); + sound/songs/midi/se_m_scratch.o(.rodata); + sound/songs/midi/se_m_vicegrip.o(.rodata); + sound/songs/midi/se_m_wing_attack.o(.rodata); + sound/songs/midi/se_m_fly.o(.rodata); + sound/songs/midi/se_m_sand_attack.o(.rodata); + sound/songs/midi/se_m_razor_wind2.o(.rodata); + sound/songs/se_m_bite.o(.rodata); + sound/songs/midi/se_m_headbutt.o(.rodata); + sound/songs/se_m_surf.o(.rodata); + sound/songs/se_m_hydro_pump.o(.rodata); + sound/songs/se_m_whirlpool.o(.rodata); + sound/songs/midi/se_m_horn_attack.o(.rodata); + sound/songs/midi/se_m_tail_whip.o(.rodata); + sound/songs/se_m_mist.o(.rodata); + sound/songs/se_m_poison_powder.o(.rodata); + sound/songs/midi/se_m_bind.o(.rodata); + sound/songs/se_m_dragon_rage.o(.rodata); + sound/songs/se_m_sing.o(.rodata); + sound/songs/se_m_perish_song.o(.rodata); + sound/songs/midi/se_m_pay_day.o(.rodata); + sound/songs/se_m_dig.o(.rodata); + sound/songs/se_m_dizzy_punch.o(.rodata); + sound/songs/se_m_self_destruct.o(.rodata); + sound/songs/se_m_explosion.o(.rodata); + sound/songs/se_m_absorb_2.o(.rodata); + sound/songs/se_m_absorb.o(.rodata); + sound/songs/se_m_screech.o(.rodata); + sound/songs/se_m_bubble_beam.o(.rodata); + sound/songs/se_m_bubble_beam2.o(.rodata); + sound/songs/se_m_supersonic.o(.rodata); + sound/songs/se_m_belly_drum.o(.rodata); + sound/songs/se_m_metronome.o(.rodata); + sound/songs/se_m_bonemerang.o(.rodata); + sound/songs/se_m_lick.o(.rodata); + sound/songs/se_m_psybeam.o(.rodata); + sound/songs/se_m_faint_attack.o(.rodata); + sound/songs/midi/se_m_swords_dance.o(.rodata); + sound/songs/midi/se_m_leer.o(.rodata); + sound/songs/se_m_swagger.o(.rodata); + sound/songs/se_m_swagger2.o(.rodata); + sound/songs/se_m_heal_bell.o(.rodata); + sound/songs/se_m_confuse_ray.o(.rodata); + sound/songs/se_m_snore.o(.rodata); + sound/songs/se_m_brick_break.o(.rodata); + sound/songs/se_m_giga_drain.o(.rodata); + sound/songs/se_m_psybeam2.o(.rodata); + sound/songs/se_m_solar_beam.o(.rodata); + sound/songs/se_m_petal_dance.o(.rodata); + sound/songs/se_m_teleport.o(.rodata); + sound/songs/se_m_minimize.o(.rodata); + sound/songs/se_m_sketch.o(.rodata); + sound/songs/se_m_swift.o(.rodata); + sound/songs/se_m_reflect.o(.rodata); + sound/songs/se_m_barrier.o(.rodata); + sound/songs/se_m_detect.o(.rodata); + sound/songs/se_m_lock_on.o(.rodata); + sound/songs/se_m_moonlight.o(.rodata); + sound/songs/se_m_charm.o(.rodata); + sound/songs/se_m_charge.o(.rodata); + sound/songs/se_m_strength.o(.rodata); + sound/songs/se_m_hyper_beam.o(.rodata); + sound/songs/se_m_waterfall.o(.rodata); + sound/songs/se_m_reversal.o(.rodata); + sound/songs/se_m_acid_armor.o(.rodata); + sound/songs/se_m_sandstorm.o(.rodata); + sound/songs/se_m_tri_attack.o(.rodata); + sound/songs/se_m_tri_attack2.o(.rodata); + sound/songs/se_m_encore.o(.rodata); + sound/songs/se_m_encore2.o(.rodata); + sound/songs/se_m_baton_pass.o(.rodata); + sound/songs/se_m_milk_drink.o(.rodata); + sound/songs/se_m_attract.o(.rodata); + sound/songs/se_m_attract2.o(.rodata); + sound/songs/se_m_morning_sun.o(.rodata); + sound/songs/se_m_flatter.o(.rodata); + sound/songs/se_m_sand_tomb.o(.rodata); + sound/songs/se_m_grasswhistle.o(.rodata); + sound/songs/se_m_spit_up.o(.rodata); + sound/songs/se_m_dive.o(.rodata); + sound/songs/se_m_earthquake.o(.rodata); + sound/songs/se_m_twister.o(.rodata); + sound/songs/se_m_sweet_scent.o(.rodata); + sound/songs/se_m_yawn.o(.rodata); + sound/songs/se_m_sky_uppercut.o(.rodata); + sound/songs/se_m_stat_increase.o(.rodata); + sound/songs/se_m_heat_wave.o(.rodata); + sound/songs/se_m_uproar.o(.rodata); + sound/songs/se_m_hail.o(.rodata); + sound/songs/se_m_cosmic_power.o(.rodata); + sound/songs/se_m_teeter_dance.o(.rodata); + sound/songs/se_m_stat_decrease.o(.rodata); + sound/songs/se_m_haze.o(.rodata); + sound/songs/se_m_hyper_beam2.o(.rodata); + sound/songs/midi/se_rg_door.o(.rodata); + sound/songs/midi/se_rg_card_flip.o(.rodata); + sound/songs/midi/se_rg_card_flipping.o(.rodata); + sound/songs/midi/se_rg_card_open.o(.rodata); + sound/songs/midi/se_rg_bag_cursor.o(.rodata); + sound/songs/midi/se_rg_bag_pocket.o(.rodata); + sound/songs/midi/se_rg_ball_click.o(.rodata); sound/songs/midi/se_rg_shop.o(.rodata); - sound/songs/midi/se_rg_kiteki.o(.rodata); - sound/songs/midi/se_rg_help_op.o(.rodata); - sound/songs/midi/se_rg_help_cl.o(.rodata); - sound/songs/midi/se_rg_help_ng.o(.rodata); - sound/songs/midi/se_rg_deomov.o(.rodata); - sound/songs/midi/se_rg_excellent.o(.rodata); - sound/songs/midi/se_rg_nawamiss.o(.rodata); - sound/songs/midi/se_toreeye.o(.rodata); - sound/songs/midi/se_toreoff.o(.rodata); - sound/songs/midi/se_hantei1.o(.rodata); - sound/songs/midi/se_hantei2.o(.rodata); - sound/songs/midi/se_curtain.o(.rodata); - sound/songs/midi/se_curtain1.o(.rodata); - sound/songs/midi/se_ussoki.o(.rodata); - sound/songs/midi/mus_tetsuji.o(.rodata); - sound/songs/midi/mus_field13.o(.rodata); - sound/songs/midi/mus_kachi22.o(.rodata); - sound/songs/midi/mus_kachi2.o(.rodata); - sound/songs/midi/mus_kachi3.o(.rodata); - sound/songs/midi/mus_kachi5.o(.rodata); - sound/songs/midi/mus_pcc.o(.rodata); - sound/songs/midi/mus_nibi.o(.rodata); - sound/songs/midi/mus_suikun.o(.rodata); - sound/songs/midi/mus_dooro1.o(.rodata); - sound/songs/midi/mus_dooro_x1.o(.rodata); - sound/songs/midi/mus_dooro_x3.o(.rodata); - sound/songs/midi/mus_machi_s2.o(.rodata); - sound/songs/midi/mus_machi_s4.o(.rodata); - sound/songs/midi/mus_gim.o(.rodata); - sound/songs/midi/mus_naminori.o(.rodata); - sound/songs/midi/mus_dan01.o(.rodata); - sound/songs/midi/mus_fanfa1.o(.rodata); - sound/songs/midi/mus_me_asa.o(.rodata); - sound/songs/midi/mus_me_bachi.o(.rodata); - sound/songs/midi/mus_fanfa4.o(.rodata); - sound/songs/midi/mus_fanfa5.o(.rodata); - sound/songs/midi/mus_me_waza.o(.rodata); - sound/songs/midi/mus_bijyutu.o(.rodata); - sound/songs/midi/mus_dooro_x4.o(.rodata); - sound/songs/midi/mus_fune_kan.o(.rodata); - sound/songs/midi/mus_me_shinka.o(.rodata); - sound/songs/midi/mus_shinka.o(.rodata); - sound/songs/midi/mus_me_wasure.o(.rodata); - sound/songs/midi/mus_syoujoeye.o(.rodata); - sound/songs/midi/mus_boyeye.o(.rodata); - sound/songs/midi/mus_dan02.o(.rodata); - sound/songs/midi/mus_machi_s3.o(.rodata); - sound/songs/midi/mus_odamaki.o(.rodata); - sound/songs/midi/mus_b_tower.o(.rodata); - sound/songs/midi/mus_swimeye.o(.rodata); - sound/songs/midi/mus_dan03.o(.rodata); - sound/songs/midi/mus_me_kinomi.o(.rodata); - sound/songs/midi/mus_me_tama.o(.rodata); - sound/songs/midi/mus_me_b_big.o(.rodata); - sound/songs/midi/mus_me_b_small.o(.rodata); - sound/songs/midi/mus_me_zannen.o(.rodata); - sound/songs/midi/mus_bd_time.o(.rodata); - sound/songs/midi/mus_test1.o(.rodata); - sound/songs/midi/mus_test2.o(.rodata); - sound/songs/midi/mus_test3.o(.rodata); - sound/songs/midi/mus_test4.o(.rodata); - sound/songs/midi/mus_test.o(.rodata); - sound/songs/midi/mus_gomachi0.o(.rodata); - sound/songs/midi/mus_gotown.o(.rodata); - sound/songs/midi/mus_pokecen.o(.rodata); - sound/songs/midi/mus_nextroad.o(.rodata); - sound/songs/midi/mus_granroad.o(.rodata); + sound/songs/midi/se_rg_ss_anne_horn.o(.rodata); + sound/songs/midi/se_rg_help_open.o(.rodata); + sound/songs/midi/se_rg_help_close.o(.rodata); + sound/songs/midi/se_rg_help_error.o(.rodata); + sound/songs/midi/se_rg_deoxys_move.o(.rodata); + sound/songs/midi/se_rg_poke_jump_success.o(.rodata); + sound/songs/midi/se_rg_poke_jump_failure.o(.rodata); + sound/songs/midi/se_pokenav_call.o(.rodata); + sound/songs/midi/se_pokenav_hang_up.o(.rodata); + sound/songs/midi/se_arena_timeup1.o(.rodata); + sound/songs/midi/se_arena_timeup2.o(.rodata); + sound/songs/midi/se_pike_curtain_close.o(.rodata); + sound/songs/midi/se_pike_curtain_open.o(.rodata); + sound/songs/midi/se_sudowoodo_shake.o(.rodata); + sound/songs/midi/mus_littleroot_test.o(.rodata); + sound/songs/midi/mus_gsc_route38.o(.rodata); + sound/songs/midi/mus_caught.o(.rodata); + sound/songs/midi/mus_victory_wild.o(.rodata); + sound/songs/midi/mus_victory_gym_leader.o(.rodata); + sound/songs/midi/mus_victory_league.o(.rodata); + sound/songs/midi/mus_c_comm_center.o(.rodata); + sound/songs/midi/mus_gsc_pewter.o(.rodata); + sound/songs/midi/mus_c_vs_legend_beast.o(.rodata); + sound/songs/midi/mus_route101.o(.rodata); + sound/songs/midi/mus_route110.o(.rodata); + sound/songs/midi/mus_route120.o(.rodata); + sound/songs/midi/mus_petalburg.o(.rodata); + sound/songs/midi/mus_oldale.o(.rodata); + sound/songs/midi/mus_gym.o(.rodata); + sound/songs/midi/mus_surf.o(.rodata); + sound/songs/midi/mus_petalburg_woods.o(.rodata); + sound/songs/midi/mus_level_up.o(.rodata); + sound/songs/midi/mus_heal.o(.rodata); + sound/songs/midi/mus_obtain_badge.o(.rodata); + sound/songs/midi/mus_obtain_item.o(.rodata); + sound/songs/midi/mus_evolved.o(.rodata); + sound/songs/midi/mus_obtain_tmhm.o(.rodata); + sound/songs/midi/mus_lilycove_museum.o(.rodata); + sound/songs/midi/mus_route122.o(.rodata); + sound/songs/midi/mus_oceanic_museum.o(.rodata); + sound/songs/midi/mus_evolution_intro.o(.rodata); + sound/songs/midi/mus_evolution.o(.rodata); + sound/songs/midi/mus_move_deleted.o(.rodata); + sound/songs/midi/mus_encounter_girl.o(.rodata); + sound/songs/midi/mus_encounter_male.o(.rodata); + sound/songs/midi/mus_abandoned_ship.o(.rodata); + sound/songs/midi/mus_fortree.o(.rodata); + sound/songs/midi/mus_birch_lab.o(.rodata); + sound/songs/midi/mus_b_tower_rs.o(.rodata); + sound/songs/midi/mus_encounter_swimmer.o(.rodata); + sound/songs/midi/mus_cave_of_origin.o(.rodata); + sound/songs/midi/mus_obtain_berry.o(.rodata); + sound/songs/midi/mus_awaken_legend.o(.rodata); + sound/songs/midi/mus_slots_jackpot.o(.rodata); + sound/songs/midi/mus_slots_win.o(.rodata); + sound/songs/midi/mus_too_bad.o(.rodata); + sound/songs/midi/mus_roulette.o(.rodata); + sound/songs/midi/mus_link_contest_p1.o(.rodata); + sound/songs/midi/mus_link_contest_p2.o(.rodata); + sound/songs/midi/mus_link_contest_p3.o(.rodata); + sound/songs/midi/mus_link_contest_p4.o(.rodata); + sound/songs/midi/mus_encounter_rich.o(.rodata); + sound/songs/midi/mus_verdanturf.o(.rodata); + sound/songs/midi/mus_rustboro.o(.rodata); + sound/songs/midi/mus_poke_center.o(.rodata); + sound/songs/midi/mus_route104.o(.rodata); + sound/songs/midi/mus_route119.o(.rodata); sound/songs/midi/mus_cycling.o(.rodata); - sound/songs/midi/mus_friendly.o(.rodata); - sound/songs/midi/mus_mishiro.o(.rodata); - sound/songs/midi/mus_tozan.o(.rodata); - sound/songs/midi/mus_girleye.o(.rodata); - sound/songs/midi/mus_minamo.o(.rodata); - sound/songs/midi/mus_ashroad.o(.rodata); - sound/songs/midi/mus_event0.o(.rodata); - sound/songs/midi/mus_deepdeep.o(.rodata); - sound/songs/midi/mus_kachi1.o(.rodata); - sound/songs/midi/mus_title3.o(.rodata); - sound/songs/midi/mus_demo1.o(.rodata); - sound/songs/midi/mus_girl_sup.o(.rodata); - sound/songs/midi/mus_hageshii.o(.rodata); - sound/songs/midi/mus_kakkoii.o(.rodata); - sound/songs/midi/mus_kazanbai.o(.rodata); - sound/songs/midi/mus_aqa_0.o(.rodata); - sound/songs/midi/mus_tsuretek.o(.rodata); - sound/songs/midi/mus_boy_sup.o(.rodata); - sound/songs/midi/mus_rainbow.o(.rodata); - sound/songs/midi/mus_ayasii.o(.rodata); - sound/songs/midi/mus_kachi4.o(.rodata); - sound/songs/midi/mus_ropeway.o(.rodata); - sound/songs/midi/mus_casino.o(.rodata); - sound/songs/midi/mus_hightown.o(.rodata); - sound/songs/midi/mus_safari.o(.rodata); - sound/songs/midi/mus_c_road.o(.rodata); - sound/songs/midi/mus_ajito.o(.rodata); - sound/songs/midi/mus_m_boat.o(.rodata); - sound/songs/midi/mus_m_dungon.o(.rodata); - sound/songs/midi/mus_finecity.o(.rodata); - sound/songs/midi/mus_machupi.o(.rodata); - sound/songs/midi/mus_p_school.o(.rodata); - sound/songs/midi/mus_dendou.o(.rodata); - sound/songs/midi/mus_tonekusa.o(.rodata); - sound/songs/midi/mus_maborosi.o(.rodata); - sound/songs/midi/mus_con_fan.o(.rodata); - sound/songs/midi/mus_contest0.o(.rodata); - sound/songs/midi/mus_mgm0.o(.rodata); - sound/songs/midi/mus_t_battle.o(.rodata); - sound/songs/midi/mus_ooame.o(.rodata); - sound/songs/midi/mus_hideri.o(.rodata); - sound/songs/midi/mus_runecity.o(.rodata); - sound/songs/midi/mus_con_k.o(.rodata); - sound/songs/midi/mus_eikou_r.o(.rodata); - sound/songs/midi/mus_karakuri.o(.rodata); - sound/songs/midi/mus_hutago.o(.rodata); - sound/songs/midi/mus_sitennou.o(.rodata); - sound/songs/midi/mus_yama_eye.o(.rodata); - sound/songs/midi/mus_conlobby.o(.rodata); - sound/songs/midi/mus_inter_v.o(.rodata); - sound/songs/midi/mus_daigo.o(.rodata); - sound/songs/midi/mus_thankfor.o(.rodata); + sound/songs/midi/mus_poke_mart.o(.rodata); + sound/songs/midi/mus_littleroot.o(.rodata); + sound/songs/midi/mus_mt_chimney.o(.rodata); + sound/songs/midi/mus_encounter_female.o(.rodata); + sound/songs/midi/mus_lilycove.o(.rodata); + sound/songs/midi/mus_route111.o(.rodata); + sound/songs/midi/mus_help.o(.rodata); + sound/songs/midi/mus_underwater.o(.rodata); + sound/songs/midi/mus_victory_trainer.o(.rodata); + sound/songs/midi/mus_title.o(.rodata); + sound/songs/midi/mus_intro.o(.rodata); + sound/songs/midi/mus_encounter_may.o(.rodata); + sound/songs/midi/mus_encounter_intense.o(.rodata); + sound/songs/midi/mus_encounter_cool.o(.rodata); + sound/songs/midi/mus_route113.o(.rodata); + sound/songs/midi/mus_encounter_aqua.o(.rodata); + sound/songs/midi/mus_follow_me.o(.rodata); + sound/songs/midi/mus_encounter_brendan.o(.rodata); + sound/songs/midi/mus_ever_grande.o(.rodata); + sound/songs/midi/mus_encounter_suspicious.o(.rodata); + sound/songs/midi/mus_victory_aqua_magma.o(.rodata); + sound/songs/midi/mus_cable_car.o(.rodata); + sound/songs/midi/mus_game_corner.o(.rodata); + sound/songs/midi/mus_dewford.o(.rodata); + sound/songs/midi/mus_safari_zone.o(.rodata); + sound/songs/midi/mus_victory_road.o(.rodata); + sound/songs/midi/mus_aqua_magma_hideout.o(.rodata); + sound/songs/midi/mus_sailing.o(.rodata); + sound/songs/midi/mus_mt_pyre.o(.rodata); + sound/songs/midi/mus_slateport.o(.rodata); + sound/songs/midi/mus_mt_pyre_exterior.o(.rodata); + sound/songs/midi/mus_school.o(.rodata); + sound/songs/midi/mus_hall_of_fame.o(.rodata); + sound/songs/midi/mus_fallarbor.o(.rodata); + sound/songs/midi/mus_sealed_chamber.o(.rodata); + sound/songs/midi/mus_contest_winner.o(.rodata); + sound/songs/midi/mus_contest.o(.rodata); + sound/songs/midi/mus_encounter_magma.o(.rodata); + sound/songs/midi/mus_intro_battle.o(.rodata); + sound/songs/midi/mus_abnormal_weather.o(.rodata); + sound/songs/midi/mus_weather_groudon.o(.rodata); + sound/songs/midi/mus_sootopolis.o(.rodata); + sound/songs/midi/mus_contest_results.o(.rodata); + sound/songs/midi/mus_hall_of_fame_room.o(.rodata); + sound/songs/midi/mus_trick_house.o(.rodata); + sound/songs/midi/mus_encounter_twins.o(.rodata); + sound/songs/midi/mus_encounter_elite_four.o(.rodata); + sound/songs/midi/mus_encounter_hiker.o(.rodata); + sound/songs/midi/mus_contest_lobby.o(.rodata); + sound/songs/midi/mus_encounter_interviewer.o(.rodata); + sound/songs/midi/mus_encounter_champion.o(.rodata); + sound/songs/midi/mus_credits.o(.rodata); sound/songs/midi/mus_end.o(.rodata); sound/songs/midi/mus_b_frontier.o(.rodata); sound/songs/midi/mus_b_arena.o(.rodata); - sound/songs/midi/mus_me_pointget.o(.rodata); - sound/songs/midi/mus_me_tore_eye.o(.rodata); - sound/songs/midi/mus_pyramid.o(.rodata); - sound/songs/midi/mus_pyramid_top.o(.rodata); + sound/songs/midi/mus_obtain_b_points.o(.rodata); + sound/songs/midi/mus_register_match_call.o(.rodata); + sound/songs/midi/mus_b_pyramid.o(.rodata); + sound/songs/midi/mus_b_pyramid_top.o(.rodata); sound/songs/midi/mus_b_palace.o(.rodata); - sound/songs/midi/mus_rekkuu_kourin.o(.rodata); - sound/songs/midi/mus_sattower.o(.rodata); - sound/songs/midi/mus_me_symbolget.o(.rodata); + sound/songs/midi/mus_rayquaza_appears.o(.rodata); + sound/songs/midi/mus_b_tower.o(.rodata); + sound/songs/midi/mus_obtain_symbol.o(.rodata); sound/songs/midi/mus_b_dome.o(.rodata); - sound/songs/midi/mus_b_tube.o(.rodata); + sound/songs/midi/mus_b_pike.o(.rodata); sound/songs/midi/mus_b_factory.o(.rodata); - sound/songs/midi/mus_vs_rekku.o(.rodata); - sound/songs/midi/mus_vs_front.o(.rodata); + sound/songs/midi/mus_vs_rayquaza.o(.rodata); + sound/songs/midi/mus_vs_frontier_brain.o(.rodata); sound/songs/midi/mus_vs_mew.o(.rodata); - sound/songs/midi/mus_b_dome1.o(.rodata); - sound/songs/midi/mus_battle27.o(.rodata); - sound/songs/midi/mus_battle31.o(.rodata); - sound/songs/midi/mus_battle20.o(.rodata); - sound/songs/midi/mus_battle32.o(.rodata); - sound/songs/midi/mus_battle33.o(.rodata); - sound/songs/midi/mus_battle36.o(.rodata); - sound/songs/midi/mus_battle34.o(.rodata); - sound/songs/midi/mus_battle35.o(.rodata); - sound/songs/midi/mus_battle38.o(.rodata); - sound/songs/midi/mus_battle30.o(.rodata); - sound/songs/midi/mus_rg_annai.o(.rodata); - sound/songs/midi/mus_rg_slot.o(.rodata); - sound/songs/midi/mus_rg_ajito.o(.rodata); + sound/songs/midi/mus_b_dome_lobby.o(.rodata); + sound/songs/midi/mus_vs_wild.o(.rodata); + sound/songs/midi/mus_vs_aqua_magma.o(.rodata); + sound/songs/midi/mus_vs_trainer.o(.rodata); + sound/songs/midi/mus_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_vs_champion.o(.rodata); + sound/songs/midi/mus_vs_regi.o(.rodata); + sound/songs/midi/mus_vs_kyogre_groudon.o(.rodata); + sound/songs/midi/mus_vs_rival.o(.rodata); + sound/songs/midi/mus_vs_elite_four.o(.rodata); + sound/songs/midi/mus_vs_aqua_magma_leader.o(.rodata); + sound/songs/midi/mus_rg_follow_me.o(.rodata); + sound/songs/midi/mus_rg_game_corner.o(.rodata); + sound/songs/midi/mus_rg_rocket_hideout.o(.rodata); sound/songs/midi/mus_rg_gym.o(.rodata); - sound/songs/midi/mus_rg_purin.o(.rodata); - sound/songs/midi/mus_rg_demo.o(.rodata); + sound/songs/midi/mus_rg_jigglypuff.o(.rodata); + sound/songs/midi/mus_rg_intro_fight.o(.rodata); sound/songs/midi/mus_rg_title.o(.rodata); - sound/songs/midi/mus_rg_guren.o(.rodata); - sound/songs/midi/mus_rg_shion.o(.rodata); - sound/songs/midi/mus_rg_kaihuku.o(.rodata); + sound/songs/midi/mus_rg_cinnabar.o(.rodata); + sound/songs/midi/mus_rg_lavender.o(.rodata); + sound/songs/midi/mus_rg_heal.o(.rodata); sound/songs/midi/mus_rg_cycling.o(.rodata); - sound/songs/midi/mus_rg_rocket.o(.rodata); - sound/songs/midi/mus_rg_shoujo.o(.rodata); - sound/songs/midi/mus_rg_shounen.o(.rodata); - sound/songs/midi/mus_rg_dendou.o(.rodata); - sound/songs/midi/mus_rg_t_mori.o(.rodata); - sound/songs/midi/mus_rg_otsukimi.o(.rodata); - sound/songs/midi/mus_rg_pokeyashi.o(.rodata); - sound/songs/midi/mus_rg_ending.o(.rodata); - sound/songs/midi/mus_rg_load01.o(.rodata); - sound/songs/midi/mus_rg_opening.o(.rodata); - sound/songs/midi/mus_rg_load02.o(.rodata); - sound/songs/midi/mus_rg_load03.o(.rodata); - sound/songs/midi/mus_rg_champ_r.o(.rodata); - sound/songs/midi/mus_rg_vs_gym.o(.rodata); - sound/songs/midi/mus_rg_vs_tore.o(.rodata); - sound/songs/midi/mus_rg_vs_yasei.o(.rodata); - sound/songs/midi/mus_rg_vs_last.o(.rodata); - sound/songs/midi/mus_rg_masara.o(.rodata); - sound/songs/midi/mus_rg_kenkyu.o(.rodata); - sound/songs/midi/mus_rg_ohkido.o(.rodata); - sound/songs/midi/mus_rg_pokecen.o(.rodata); - sound/songs/midi/mus_rg_santoan.o(.rodata); - sound/songs/midi/mus_rg_naminori.o(.rodata); - sound/songs/midi/mus_rg_p_tower.o(.rodata); - sound/songs/midi/mus_rg_shiruhu.o(.rodata); - sound/songs/midi/mus_rg_hanada.o(.rodata); - sound/songs/midi/mus_rg_tamamusi.o(.rodata); - sound/songs/midi/mus_rg_win_tre.o(.rodata); - sound/songs/midi/mus_rg_win_yasei.o(.rodata); - sound/songs/midi/mus_rg_win_gym.o(.rodata); - sound/songs/midi/mus_rg_kuchiba.o(.rodata); - sound/songs/midi/mus_rg_nibi.o(.rodata); - sound/songs/midi/mus_rg_rival1.o(.rodata); - sound/songs/midi/mus_rg_rival2.o(.rodata); - sound/songs/midi/mus_rg_fan2.o(.rodata); - sound/songs/midi/mus_rg_fan5.o(.rodata); - sound/songs/midi/mus_rg_fan6.o(.rodata); - sound/songs/midi/mus_me_rg_photo.o(.rodata); - sound/songs/midi/mus_rg_titlerog.o(.rodata); - sound/songs/midi/mus_rg_get_yasei.o(.rodata); - sound/songs/midi/mus_rg_sousa.o(.rodata); - sound/songs/midi/mus_rg_sekaikan.o(.rodata); - sound/songs/midi/mus_rg_seibetu.o(.rodata); - sound/songs/midi/mus_rg_jump.o(.rodata); - sound/songs/midi/mus_rg_union.o(.rodata); - sound/songs/midi/mus_rg_network.o(.rodata); - sound/songs/midi/mus_rg_okurimono.o(.rodata); - sound/songs/midi/mus_rg_kinomikui.o(.rodata); - sound/songs/midi/mus_rg_nanadungeon.o(.rodata); - sound/songs/midi/mus_rg_oshie_tv.o(.rodata); - sound/songs/midi/mus_rg_nanashima.o(.rodata); - sound/songs/midi/mus_rg_nanaiseki.o(.rodata); - sound/songs/midi/mus_rg_nana123.o(.rodata); - sound/songs/midi/mus_rg_nana45.o(.rodata); - sound/songs/midi/mus_rg_nana67.o(.rodata); - sound/songs/midi/mus_rg_pokefue.o(.rodata); - sound/songs/midi/mus_rg_vs_deo.o(.rodata); - sound/songs/midi/mus_rg_vs_myu2.o(.rodata); - sound/songs/midi/mus_rg_vs_den.o(.rodata); - sound/songs/midi/mus_rg_exeye.o(.rodata); - sound/songs/midi/mus_rg_deoeye.o(.rodata); - sound/songs/midi/mus_rg_t_tower.o(.rodata); - sound/songs/midi/mus_rg_slowmasara.o(.rodata); - sound/songs/midi/mus_rg_tvnoize.o(.rodata); + sound/songs/midi/mus_rg_encounter_rocket.o(.rodata); + sound/songs/midi/mus_rg_encounter_girl.o(.rodata); + sound/songs/midi/mus_rg_encounter_boy.o(.rodata); + sound/songs/midi/mus_rg_hall_of_fame.o(.rodata); + sound/songs/midi/mus_rg_viridian_forest.o(.rodata); + sound/songs/midi/mus_rg_mt_moon.o(.rodata); + sound/songs/midi/mus_rg_poke_mansion.o(.rodata); + sound/songs/midi/mus_rg_credits.o(.rodata); + sound/songs/midi/mus_rg_route1.o(.rodata); + sound/songs/midi/mus_rg_route24.o(.rodata); + sound/songs/midi/mus_rg_route3.o(.rodata); + sound/songs/midi/mus_rg_route11.o(.rodata); + sound/songs/midi/mus_rg_victory_road.o(.rodata); + sound/songs/midi/mus_rg_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_rg_vs_trainer.o(.rodata); + sound/songs/midi/mus_rg_vs_wild.o(.rodata); + sound/songs/midi/mus_rg_vs_champion.o(.rodata); + sound/songs/midi/mus_rg_pallet.o(.rodata); + sound/songs/midi/mus_rg_oak_lab.o(.rodata); + sound/songs/midi/mus_rg_oak.o(.rodata); + sound/songs/midi/mus_rg_poke_center.o(.rodata); + sound/songs/midi/mus_rg_ss_anne.o(.rodata); + sound/songs/midi/mus_rg_surf.o(.rodata); + sound/songs/midi/mus_rg_poke_tower.o(.rodata); + sound/songs/midi/mus_rg_silph.o(.rodata); + sound/songs/midi/mus_rg_fuchsia.o(.rodata); + sound/songs/midi/mus_rg_celadon.o(.rodata); + sound/songs/midi/mus_rg_victory_trainer.o(.rodata); + sound/songs/midi/mus_rg_victory_wild.o(.rodata); + sound/songs/midi/mus_rg_victory_gym_leader.o(.rodata); + sound/songs/midi/mus_rg_vermillion.o(.rodata); + sound/songs/midi/mus_rg_pewter.o(.rodata); + sound/songs/midi/mus_rg_encounter_rival.o(.rodata); + sound/songs/midi/mus_rg_rival_exit.o(.rodata); + sound/songs/midi/mus_rg_dex_rating.o(.rodata); + sound/songs/midi/mus_rg_obtain_key_item.o(.rodata); + sound/songs/midi/mus_rg_caught_intro.o(.rodata); + sound/songs/midi/mus_rg_photo.o(.rodata); + sound/songs/midi/mus_rg_game_freak.o(.rodata); + sound/songs/midi/mus_rg_caught.o(.rodata); + sound/songs/midi/mus_rg_new_game_instruct.o(.rodata); + sound/songs/midi/mus_rg_new_game_intro.o(.rodata); + sound/songs/midi/mus_rg_new_game_exit.o(.rodata); + sound/songs/midi/mus_rg_poke_jump.o(.rodata); + sound/songs/midi/mus_rg_union_room.o(.rodata); + sound/songs/midi/mus_rg_net_center.o(.rodata); + sound/songs/midi/mus_rg_mystery_gift.o(.rodata); + sound/songs/midi/mus_rg_berry_pick.o(.rodata); + sound/songs/midi/mus_rg_sevii_cave.o(.rodata); + sound/songs/midi/mus_rg_teachy_tv_show.o(.rodata); + sound/songs/midi/mus_rg_sevii_route.o(.rodata); + sound/songs/midi/mus_rg_sevii_dungeon.o(.rodata); + sound/songs/midi/mus_rg_sevii_123.o(.rodata); + sound/songs/midi/mus_rg_sevii_45.o(.rodata); + sound/songs/midi/mus_rg_sevii_67.o(.rodata); + sound/songs/midi/mus_rg_poke_flute.o(.rodata); + sound/songs/midi/mus_rg_vs_deoxys.o(.rodata); + sound/songs/midi/mus_rg_vs_mewtwo.o(.rodata); + sound/songs/midi/mus_rg_vs_legend.o(.rodata); + sound/songs/midi/mus_rg_encounter_gym_leader.o(.rodata); + sound/songs/midi/mus_rg_encounter_deoxys.o(.rodata); + sound/songs/midi/mus_rg_trainer_tower.o(.rodata); + sound/songs/midi/mus_rg_slow_pallet.o(.rodata); + sound/songs/midi/mus_rg_teachy_tv_menu.o(.rodata); sound/songs/midi/ph_trap_blend.o(.rodata); sound/songs/midi/ph_trap_held.o(.rodata); sound/songs/midi/ph_trap_solo.o(.rodata); diff --git a/libagbsyscall/libagbsyscall.s b/libagbsyscall/libagbsyscall.s index 00c40d08e0..0c90da9ed0 100644 --- a/libagbsyscall/libagbsyscall.s +++ b/libagbsyscall/libagbsyscall.s @@ -1,9 +1,12 @@ .include "../constants/gba_constants.inc" .include "../asm/macros/function.inc" + + .syntax unified .text .set SOFT_RESET_DIRECT_BUF, 0x03007FFA + .set USER_STACK, 0x03007F00 .set RESET_EX_WRAM_FLAG, 0x1 .ifdef NO_GRANULAR_AGBSYSCALL @@ -106,7 +109,7 @@ SoundDriverVSyncOn: thumb_func_start Mod Mod: svc #6 - mov r0, r1 + adds r0, r1, #0 bx lr thumb_func_end Mod .endif @@ -145,7 +148,7 @@ HuffUnComp: .endif .ifdef L_SoftResetExram - arm_func_start SoftResetExram + thumb_func_start SoftResetExram SoftResetExram: ldr r3, =REG_IME movs r2, #0 @@ -153,14 +156,14 @@ SoftResetExram: ldr r3, =SOFT_RESET_DIRECT_BUF movs r2, #1 strb r2, [r3, #0] - subs r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00 + subs r3, #SOFT_RESET_DIRECT_BUF - USER_STACK mov sp, r3 movs r2, #RESET_EX_WRAM_FLAG bics r0, r2 svc #1 svc #0 .pool - arm_func_end SoftResetExram + thumb_func_end SoftResetExram .endif .ifdef L_MusicPlayerFadeOut @@ -231,7 +234,7 @@ DivArm: thumb_func_start ModArm ModArm: svc #7 - mov r0, r1 + adds r0, r1, #0 bx lr thumb_func_end ModArm .endif @@ -271,7 +274,7 @@ Diff8bitUnFilterWram: .ifdef L_MultiBoot thumb_func_start MultiBoot MultiBoot: - mov r1, #1 + movs r1, #1 svc #37 bx lr thumb_func_end MultiBoot @@ -326,7 +329,7 @@ SoftResetRom: ldr r3, =SOFT_RESET_DIRECT_BUF movs r2, #0 strb r2, [r3, #0] - sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00 + subs r3, #SOFT_RESET_DIRECT_BUF - USER_STACK mov sp, r3 svc #1 svc #0 @@ -413,7 +416,7 @@ SoftReset: ldr r3, =REG_IME movs r2, #0 strb r2, [r3, #0] - ldr r1, =0x3007f00 + ldr r1, =USER_STACK mov sp, r1 svc #1 svc #0 diff --git a/songs.mk b/songs.mk index e1007af21b..698f983ceb 100644 --- a/songs.mk +++ b/songs.mk @@ -3,16 +3,16 @@ STD_REVERB = 50 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< -$(MID_SUBDIR)/mus_ajito.s: %.s: %.mid +$(MID_SUBDIR)/mus_aqua_magma_hideout.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G076 -V084 -$(MID_SUBDIR)/mus_aqa_0.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_aqua.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G065 -V086 -$(MID_SUBDIR)/mus_ashroad.s: %.s: %.mid +$(MID_SUBDIR)/mus_route111.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G055 -V076 -$(MID_SUBDIR)/mus_ayasii.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_suspicious.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G069 -V078 $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid @@ -21,7 +21,7 @@ $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid $(MID_SUBDIR)/mus_b_dome.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G111 -V090 -$(MID_SUBDIR)/mus_b_dome1.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_dome_lobby.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G111 -V056 $(MID_SUBDIR)/mus_b_factory.s: %.s: %.mid @@ -33,604 +33,604 @@ $(MID_SUBDIR)/mus_b_frontier.s: %.s: %.mid $(MID_SUBDIR)/mus_b_palace.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G108 -V105 -$(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_tower_rs.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G035 -V080 -$(MID_SUBDIR)/mus_b_tube.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_pike.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G112 -V092 -$(MID_SUBDIR)/mus_battle20.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G119 -V080 -P1 -$(MID_SUBDIR)/mus_battle27.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G117 -V080 -P1 -$(MID_SUBDIR)/mus_battle30.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_aqua_magma_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G126 -V080 -P1 -$(MID_SUBDIR)/mus_battle31.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_aqua_magma.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G118 -V080 -P1 -$(MID_SUBDIR)/mus_battle32.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G120 -V080 -P1 -$(MID_SUBDIR)/mus_battle33.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_champion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G121 -V080 -P1 -$(MID_SUBDIR)/mus_battle34.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_kyogre_groudon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G123 -V080 -P1 -$(MID_SUBDIR)/mus_battle35.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_rival.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G124 -V080 -P1 -$(MID_SUBDIR)/mus_battle36.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_regi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G122 -V080 -P1 -$(MID_SUBDIR)/mus_battle38.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_elite_four.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G125 -V080 -P1 -$(MID_SUBDIR)/mus_bd_time.s: %.s: %.mid +$(MID_SUBDIR)/mus_roulette.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G038 -V080 -$(MID_SUBDIR)/mus_bijyutu.s: %.s: %.mid +$(MID_SUBDIR)/mus_lilycove_museum.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G020 -V080 -$(MID_SUBDIR)/mus_boy_sup.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_brendan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G067 -V078 -$(MID_SUBDIR)/mus_boyeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_male.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G028 -V080 -$(MID_SUBDIR)/mus_c_road.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_road.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G075 -V076 -$(MID_SUBDIR)/mus_casino.s: %.s: %.mid +$(MID_SUBDIR)/mus_game_corner.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G072 -V072 -$(MID_SUBDIR)/mus_con_fan.s: %.s: %.mid +$(MID_SUBDIR)/mus_contest_winner.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G085 -V100 -$(MID_SUBDIR)/mus_con_k.s: %.s: %.mid +$(MID_SUBDIR)/mus_contest_results.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G092 -V080 -$(MID_SUBDIR)/mus_conlobby.s: %.s: %.mid +$(MID_SUBDIR)/mus_contest_lobby.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G098 -V060 -$(MID_SUBDIR)/mus_contest0.s: %.s: %.mid +$(MID_SUBDIR)/mus_contest.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G086 -V088 $(MID_SUBDIR)/mus_cycling.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G049 -V083 -$(MID_SUBDIR)/mus_daigo.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_champion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G100 -V076 -$(MID_SUBDIR)/mus_dan01.s: %.s: %.mid +$(MID_SUBDIR)/mus_petalburg_woods.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G018 -V080 -$(MID_SUBDIR)/mus_dan02.s: %.s: %.mid +$(MID_SUBDIR)/mus_abandoned_ship.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G030 -V080 -$(MID_SUBDIR)/mus_dan03.s: %.s: %.mid +$(MID_SUBDIR)/mus_cave_of_origin.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G037 -V080 -$(MID_SUBDIR)/mus_deepdeep.s: %.s: %.mid +$(MID_SUBDIR)/mus_underwater.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G057 -V094 -$(MID_SUBDIR)/mus_demo1.s: %.s: %.mid +$(MID_SUBDIR)/mus_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G060 -V090 -$(MID_SUBDIR)/mus_dendou.s: %.s: %.mid +$(MID_SUBDIR)/mus_hall_of_fame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G082 -V078 -$(MID_SUBDIR)/mus_dooro_x1.s: %.s: %.mid +$(MID_SUBDIR)/mus_route110.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080 -$(MID_SUBDIR)/mus_dooro_x3.s: %.s: %.mid +$(MID_SUBDIR)/mus_route120.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G014 -V080 -$(MID_SUBDIR)/mus_dooro_x4.s: %.s: %.mid +$(MID_SUBDIR)/mus_route122.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G021 -V080 -$(MID_SUBDIR)/mus_dooro1.s: %.s: %.mid +$(MID_SUBDIR)/mus_route101.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080 $(MID_SUBDIR)/mus_dummy.s: %.s: %.mid $(MID) $< $@ -E -R40 -$(MID_SUBDIR)/mus_eikou_r.s: %.s: %.mid +$(MID_SUBDIR)/mus_hall_of_fame_room.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G093 -V080 $(MID_SUBDIR)/mus_end.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G102 -V036 -$(MID_SUBDIR)/mus_event0.s: %.s: %.mid +$(MID_SUBDIR)/mus_help.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G056 -V078 -$(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid +$(MID_SUBDIR)/mus_level_up.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolved.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_field13.s: %.s: %.mid +$(MID_SUBDIR)/mus_gsc_route38.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -V080 -$(MID_SUBDIR)/mus_finecity.s: %.s: %.mid +$(MID_SUBDIR)/mus_slateport.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G079 -V070 -$(MID_SUBDIR)/mus_friendly.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_mart.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G050 -V085 -$(MID_SUBDIR)/mus_fune_kan.s: %.s: %.mid +$(MID_SUBDIR)/mus_oceanic_museum.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G023 -V080 -$(MID_SUBDIR)/mus_gim.s: %.s: %.mid +$(MID_SUBDIR)/mus_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G013 -V080 -$(MID_SUBDIR)/mus_girl_sup.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_may.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G061 -V078 -$(MID_SUBDIR)/mus_girleye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_female.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G053 -V072 -$(MID_SUBDIR)/mus_gomachi0.s: %.s: %.mid +$(MID_SUBDIR)/mus_verdanturf.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G044 -V090 -$(MID_SUBDIR)/mus_gotown.s: %.s: %.mid +$(MID_SUBDIR)/mus_rustboro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G045 -V085 -$(MID_SUBDIR)/mus_granroad.s: %.s: %.mid +$(MID_SUBDIR)/mus_route119.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G048 -V096 -$(MID_SUBDIR)/mus_hageshii.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_intense.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G062 -V078 -$(MID_SUBDIR)/mus_hideri.s: %.s: %.mid +$(MID_SUBDIR)/mus_weather_groudon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G090 -V050 -$(MID_SUBDIR)/mus_hightown.s: %.s: %.mid +$(MID_SUBDIR)/mus_dewford.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G073 -V078 -$(MID_SUBDIR)/mus_hutago.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_twins.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G095 -V075 -$(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_interviewer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G099 -V062 -$(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G058 -V091 -$(MID_SUBDIR)/mus_kachi2.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080 -$(MID_SUBDIR)/mus_kachi3.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G024 -V080 -$(MID_SUBDIR)/mus_kachi4.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_aqua_magma.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G070 -V088 -$(MID_SUBDIR)/mus_kachi5.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_league.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G029 -V080 -$(MID_SUBDIR)/mus_kachi22.s: %.s: %.mid +$(MID_SUBDIR)/mus_caught.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080 -$(MID_SUBDIR)/mus_kakkoii.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_cool.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G063 -V086 -$(MID_SUBDIR)/mus_karakuri.s: %.s: %.mid +$(MID_SUBDIR)/mus_trick_house.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G094 -V070 -$(MID_SUBDIR)/mus_kazanbai.s: %.s: %.mid +$(MID_SUBDIR)/mus_route113.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G064 -V084 -$(MID_SUBDIR)/mus_m_boat.s: %.s: %.mid +$(MID_SUBDIR)/mus_sailing.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G077 -V086 -$(MID_SUBDIR)/mus_m_dungon.s: %.s: %.mid +$(MID_SUBDIR)/mus_mt_pyre.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G078 -V088 -$(MID_SUBDIR)/mus_maborosi.s: %.s: %.mid +$(MID_SUBDIR)/mus_sealed_chamber.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G084 -V100 -$(MID_SUBDIR)/mus_machi_s2.s: %.s: %.mid +$(MID_SUBDIR)/mus_petalburg.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G015 -V080 -$(MID_SUBDIR)/mus_machi_s3.s: %.s: %.mid +$(MID_SUBDIR)/mus_fortree.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G032 -V080 -$(MID_SUBDIR)/mus_machi_s4.s: %.s: %.mid +$(MID_SUBDIR)/mus_oldale.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G019 -V080 -$(MID_SUBDIR)/mus_machupi.s: %.s: %.mid +$(MID_SUBDIR)/mus_mt_pyre_exterior.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G080 -V080 -$(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid +$(MID_SUBDIR)/mus_heal.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid +$(MID_SUBDIR)/mus_slots_jackpot.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid +$(MID_SUBDIR)/mus_slots_win.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_badge.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_berry.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_b_points.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G103 -V090 -P5 -$(MID_SUBDIR)/mus_me_rg_photo.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_photo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5 -$(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolution_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -$(MID_SUBDIR)/mus_me_symbolget.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_symbol.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G103 -V100 -P5 -$(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid +$(MID_SUBDIR)/mus_awaken_legend.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid +$(MID_SUBDIR)/mus_register_match_call.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G105 -V090 -P5 -$(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid +$(MID_SUBDIR)/mus_move_deleted.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_tmhm.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid +$(MID_SUBDIR)/mus_too_bad.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5 -$(MID_SUBDIR)/mus_mgm0.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_magma.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G087 -V072 -$(MID_SUBDIR)/mus_minamo.s: %.s: %.mid +$(MID_SUBDIR)/mus_lilycove.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G054 -V085 -$(MID_SUBDIR)/mus_mishiro.s: %.s: %.mid +$(MID_SUBDIR)/mus_littleroot.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G051 -V100 -$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid +$(MID_SUBDIR)/mus_surf.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G017 -V080 -$(MID_SUBDIR)/mus_nextroad.s: %.s: %.mid +$(MID_SUBDIR)/mus_route104.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G047 -V097 -$(MID_SUBDIR)/mus_nibi.s: %.s: %.mid +$(MID_SUBDIR)/mus_gsc_pewter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -V080 -$(MID_SUBDIR)/mus_odamaki.s: %.s: %.mid +$(MID_SUBDIR)/mus_birch_lab.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G033 -V080 -$(MID_SUBDIR)/mus_ooame.s: %.s: %.mid +$(MID_SUBDIR)/mus_abnormal_weather.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G089 -V080 -$(MID_SUBDIR)/mus_p_school.s: %.s: %.mid +$(MID_SUBDIR)/mus_school.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G081 -V100 -$(MID_SUBDIR)/mus_pcc.s: %.s: %.mid +$(MID_SUBDIR)/mus_c_comm_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -V080 -$(MID_SUBDIR)/mus_pokecen.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G046 -V092 -$(MID_SUBDIR)/mus_pyramid.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_pyramid.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G106 -V079 -$(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_pyramid_top.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G107 -V077 -$(MID_SUBDIR)/mus_rainbow.s: %.s: %.mid +$(MID_SUBDIR)/mus_ever_grande.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G068 -V086 -$(MID_SUBDIR)/mus_rekkuu_kourin.s: %.s: %.mid +$(MID_SUBDIR)/mus_rayquaza_appears.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G109 -V090 -$(MID_SUBDIR)/mus_rg_ajito.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_rocket_hideout.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G133 -V090 -$(MID_SUBDIR)/mus_rg_annai.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_follow_me.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068 -$(MID_SUBDIR)/mus_rg_champ_r.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_victory_road.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090 $(MID_SUBDIR)/mus_rg_cycling.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G141 -V090 -$(MID_SUBDIR)/mus_rg_demo.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_intro_fight.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G136 -V090 -$(MID_SUBDIR)/mus_rg_dendou.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_hall_of_fame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G145 -V079 -$(MID_SUBDIR)/mus_rg_deoeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_deoxys.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G184 -V079 -$(MID_SUBDIR)/mus_rg_ending.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_credits.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G149 -V090 -$(MID_SUBDIR)/mus_rg_exeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090 -$(MID_SUBDIR)/mus_rg_fan2.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_dex_rating.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G175 -V070 -P5 -$(MID_SUBDIR)/mus_rg_fan5.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_obtain_key_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G178 -V077 -P5 -$(MID_SUBDIR)/mus_rg_fan6.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_caught_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -P5 -$(MID_SUBDIR)/mus_rg_get_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_caught.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G170 -V100 -$(MID_SUBDIR)/mus_rg_guren.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_cinnabar.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G138 -V090 $(MID_SUBDIR)/mus_rg_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090 -$(MID_SUBDIR)/mus_rg_hanada.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_fuchsia.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G167 -V090 -$(MID_SUBDIR)/mus_rg_jump.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_poke_jump.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_rg_kaihuku.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_heal.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G140 -V090 -$(MID_SUBDIR)/mus_rg_kenkyu.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_oak_lab.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G160 -V075 -$(MID_SUBDIR)/mus_rg_kinomikui.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_berry_pick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_rg_kuchiba.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vermillion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G172 -V090 -$(MID_SUBDIR)/mus_rg_load01.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_route1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G150 -V079 -$(MID_SUBDIR)/mus_rg_load02.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_route3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G152 -V083 -$(MID_SUBDIR)/mus_rg_load03.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_route11.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G153 -V090 -$(MID_SUBDIR)/mus_rg_masara.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_pallet.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100 -$(MID_SUBDIR)/mus_rg_naminori.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_surf.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071 -$(MID_SUBDIR)/mus_rg_nana45.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_45.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G188 -V084 -$(MID_SUBDIR)/mus_rg_nana67.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_67.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G189 -V084 -$(MID_SUBDIR)/mus_rg_nana123.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_123.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084 -$(MID_SUBDIR)/mus_rg_nanadungeon.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_cave.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090 -$(MID_SUBDIR)/mus_rg_nanaiseki.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_dungeon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090 -$(MID_SUBDIR)/mus_rg_nanashima.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_sevii_route.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G187 -V080 -$(MID_SUBDIR)/mus_rg_network.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_net_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096 -$(MID_SUBDIR)/mus_rg_nibi.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_pewter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084 -$(MID_SUBDIR)/mus_rg_ohkido.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_oak.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G161 -V086 -$(MID_SUBDIR)/mus_rg_okurimono.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_mystery_gift.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G183 -V100 -$(MID_SUBDIR)/mus_rg_opening.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_route24.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G151 -V086 -$(MID_SUBDIR)/mus_rg_oshie_tv.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_teachy_tv_show.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068 -$(MID_SUBDIR)/mus_rg_otsukimi.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_mt_moon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090 -$(MID_SUBDIR)/mus_rg_p_tower.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_poke_tower.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G165 -V090 -$(MID_SUBDIR)/mus_rg_pokecen.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_poke_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096 -$(MID_SUBDIR)/mus_rg_pokefue.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_poke_flute.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G165 -V048 -P5 -$(MID_SUBDIR)/mus_rg_pokeyashi.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_poke_mansion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G148 -V090 -$(MID_SUBDIR)/mus_rg_purin.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_jigglypuff.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G135 -V068 -P5 -$(MID_SUBDIR)/mus_rg_rival1.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_rival.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 -$(MID_SUBDIR)/mus_rg_rival2.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_rival_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 -$(MID_SUBDIR)/mus_rg_rocket.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_rocket.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G142 -V096 -$(MID_SUBDIR)/mus_rg_santoan.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_ss_anne.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G163 -V090 -$(MID_SUBDIR)/mus_rg_seibetu.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_new_game_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 -$(MID_SUBDIR)/mus_rg_sekaikan.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_new_game_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 -$(MID_SUBDIR)/mus_rg_shion.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_lavender.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G139 -V090 -$(MID_SUBDIR)/mus_rg_shiruhu.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_silph.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G166 -V076 -$(MID_SUBDIR)/mus_rg_shoujo.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_girl.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G143 -V051 -$(MID_SUBDIR)/mus_rg_shounen.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_encounter_boy.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090 -$(MID_SUBDIR)/mus_rg_slot.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_game_corner.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_rg_slowmasara.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_slow_pallet.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V092 -$(MID_SUBDIR)/mus_rg_sousa.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_new_game_instruct.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V085 -$(MID_SUBDIR)/mus_rg_t_mori.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_viridian_forest.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090 -$(MID_SUBDIR)/mus_rg_t_tower.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_trainer_tower.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090 -$(MID_SUBDIR)/mus_rg_tamamusi.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_celadon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G168 -V070 $(MID_SUBDIR)/mus_rg_title.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G137 -V090 -$(MID_SUBDIR)/mus_rg_titlerog.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_game_freak.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G181 -V075 -$(MID_SUBDIR)/mus_rg_tvnoize.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_teachy_tv_menu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G186 -V059 -$(MID_SUBDIR)/mus_rg_union.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_union_room.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_rg_vs_den.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_legend.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_rg_vs_deo.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_deoxys.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G185 -V080 -$(MID_SUBDIR)/mus_rg_vs_gym.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G155 -V090 -$(MID_SUBDIR)/mus_rg_vs_last.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_champion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G158 -V090 -$(MID_SUBDIR)/mus_rg_vs_myu2.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_mewtwo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_rg_vs_tore.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G156 -V090 -$(MID_SUBDIR)/mus_rg_vs_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_vs_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_rg_win_gym.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_victory_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090 -$(MID_SUBDIR)/mus_rg_win_tre.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_victory_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G169 -V089 -$(MID_SUBDIR)/mus_rg_win_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_rg_victory_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G170 -V090 -$(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid +$(MID_SUBDIR)/mus_cable_car.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 -$(MID_SUBDIR)/mus_runecity.s: %.s: %.mid +$(MID_SUBDIR)/mus_sootopolis.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G091 -V062 -$(MID_SUBDIR)/mus_safari.s: %.s: %.mid +$(MID_SUBDIR)/mus_safari_zone.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G074 -V082 -$(MID_SUBDIR)/mus_sattower.s: %.s: %.mid +$(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G110 -V100 -$(MID_SUBDIR)/mus_shinka.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolution.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -$(MID_SUBDIR)/mus_sitennou.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_elite_four.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G096 -V078 -$(MID_SUBDIR)/mus_suikun.s: %.s: %.mid +$(MID_SUBDIR)/mus_c_vs_legend_beast.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -V080 -$(MID_SUBDIR)/mus_swimeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_swimmer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G036 -V080 -$(MID_SUBDIR)/mus_syoujoeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_girl.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G027 -V080 -$(MID_SUBDIR)/mus_t_battle.s: %.s: %.mid +$(MID_SUBDIR)/mus_intro_battle.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G088 -V088 -$(MID_SUBDIR)/mus_test.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_rich.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G043 -V094 -$(MID_SUBDIR)/mus_test1.s: %.s: %.mid +$(MID_SUBDIR)/mus_link_contest_p1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G039 -V079 -$(MID_SUBDIR)/mus_test2.s: %.s: %.mid +$(MID_SUBDIR)/mus_link_contest_p2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G040 -V090 -$(MID_SUBDIR)/mus_test3.s: %.s: %.mid +$(MID_SUBDIR)/mus_link_contest_p3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G041 -V075 -$(MID_SUBDIR)/mus_test4.s: %.s: %.mid +$(MID_SUBDIR)/mus_link_contest_p4.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G042 -V090 -$(MID_SUBDIR)/mus_tetsuji.s: %.s: %.mid +$(MID_SUBDIR)/mus_littleroot_test.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G034 -V099 -$(MID_SUBDIR)/mus_thankfor.s: %.s: %.mid +$(MID_SUBDIR)/mus_credits.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G101 -V100 -$(MID_SUBDIR)/mus_title3.s: %.s: %.mid +$(MID_SUBDIR)/mus_title.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G059 -V090 -$(MID_SUBDIR)/mus_tonekusa.s: %.s: %.mid +$(MID_SUBDIR)/mus_fallarbor.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G083 -V100 -$(MID_SUBDIR)/mus_tozan.s: %.s: %.mid +$(MID_SUBDIR)/mus_mt_chimney.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G052 -V078 -$(MID_SUBDIR)/mus_tsuretek.s: %.s: %.mid +$(MID_SUBDIR)/mus_follow_me.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G066 -V074 -$(MID_SUBDIR)/mus_vs_front.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_frontier_brain.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G115 -V090 -P1 $(MID_SUBDIR)/mus_vs_mew.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G116 -V090 -$(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_rayquaza.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G114 -V080 -P1 -$(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_hiker.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076 $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid @@ -789,64 +789,64 @@ $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID_SUBDIR)/se_a.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_ban.s: %.s: %.mid +$(MID_SUBDIR)/se_bang.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_basabasa.s: %.s: %.mid +$(MID_SUBDIR)/se_taillow_wing_flap.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 -$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid +$(MID_SUBDIR)/se_glass_flute.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_bowa.s: %.s: %.mid +$(MID_SUBDIR)/se_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 -$(MID_SUBDIR)/se_bowa2.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_open.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid +$(MID_SUBDIR)/se_mugshot.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_heart.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_curtain_fall.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 -$(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_curtain_rise.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 -$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_icon_change.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_mons_turn.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_icon_clear.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 $(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_curtain.s: %.s: %.mid +$(MID_SUBDIR)/se_pike_curtain_close.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid +$(MID_SUBDIR)/se_pike_curtain_open.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_dansa.s: %.s: %.mid +$(MID_SUBDIR)/se_ledge.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_daugi.s: %.s: %.mid +$(MID_SUBDIR)/se_itemfinder.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_dendou.s: %.s: %.mid +$(MID_SUBDIR)/se_applause.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 -$(MID_SUBDIR)/se_doku.s: %.s: %.mid +$(MID_SUBDIR)/se_field_poison.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 $(MID_SUBDIR)/se_door.s: %.s: %.mid @@ -855,127 +855,127 @@ $(MID_SUBDIR)/se_door.s: %.s: %.mid $(MID_SUBDIR)/se_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid +$(MID_SUBDIR)/se_elevator.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_esuka.s: %.s: %.mid +$(MID_SUBDIR)/se_escalator.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 $(MID_SUBDIR)/se_exp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 -$(MID_SUBDIR)/se_expmax.s: %.s: %.mid +$(MID_SUBDIR)/se_exp_max.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5 $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 -$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_condition_lose.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid +$(MID_SUBDIR)/se_lavaridge_fall_warp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 -$(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_red.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_blue.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_yellow.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid +$(MID_SUBDIR)/se_arena_timeup1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid +$(MID_SUBDIR)/se_arena_timeup2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_hashi.s: %.s: %.mid +$(MID_SUBDIR)/se_bridge_walk.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_hazure.s: %.s: %.mid +$(MID_SUBDIR)/se_failure.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 -$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid +$(MID_SUBDIR)/se_rotating_gate.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid +$(MID_SUBDIR)/se_low_health.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3 $(MID_SUBDIR)/se_i.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid +$(MID_SUBDIR)/se_sliding_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid +$(MID_SUBDIR)/se_vend.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid +$(MID_SUBDIR)/se_bike_hop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid +$(MID_SUBDIR)/se_bike_bell.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_place.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid +$(MID_SUBDIR)/se_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 -$(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid +$(MID_SUBDIR)/se_use_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid +$(MID_SUBDIR)/se_unlock.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon2.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon3.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon4.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_4.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid +$(MID_SUBDIR)/se_super_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid +$(MID_SUBDIR)/se_not_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid +$(MID_SUBDIR)/se_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_mizu.s: %.s: %.mid +$(MID_SUBDIR)/se_puddle.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4 -$(MID_SUBDIR)/se_moter.s: %.s: %.mid +$(MID_SUBDIR)/se_berry_blender.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid +$(MID_SUBDIR)/se_switch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 $(MID_SUBDIR)/se_n.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_nageru.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_throw.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 -$(MID_SUBDIR)/se_naminori.s: %.s: %.mid +$(MID_SUBDIR)/se_ship.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4 -$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid +$(MID_SUBDIR)/se_flee.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 $(MID_SUBDIR)/se_o.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid +$(MID_SUBDIR)/se_intro_blast.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid @@ -990,275 +990,275 @@ $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid $(MID_SUBDIR)/se_pin.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4 -$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid +$(MID_SUBDIR)/se_ding_dong.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_off.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_on.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid +$(MID_SUBDIR)/se_faint.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid +$(MID_SUBDIR)/se_shiny.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5 -$(MID_SUBDIR)/se_regi.s: %.s: %.mid +$(MID_SUBDIR)/se_shop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_bag_cursor.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_bag_pocket.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_card_flip.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_card_flipping.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 -$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_card_open.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5 -$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_deoxys_move.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5 -$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_poke_jump_success.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_ball_click.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 -$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_help_close.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5 -$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_help_error.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5 -$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_help_open.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5 -$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_ss_anne_horn.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5 -$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_poke_jump_failure.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5 -$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid +$(MID_SUBDIR)/se_rg_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 -$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_crack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_stairs.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_break.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid +$(MID_SUBDIR)/se_fall.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 $(MID_SUBDIR)/se_save.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5 -$(MID_SUBDIR)/se_seikai.s: %.s: %.mid +$(MID_SUBDIR)/se_success.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4 $(MID_SUBDIR)/se_select.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 -$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_trade.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid +$(MID_SUBDIR)/se_thunderstorm.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_thunderstorm_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid +$(MID_SUBDIR)/se_thunder.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3 -$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid +$(MID_SUBDIR)/se_thunder2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3 -$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid +$(MID_SUBDIR)/se_rain.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_rain_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid +$(MID_SUBDIR)/se_downpour.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 -$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_downpour_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 -$(MID_SUBDIR)/se_tama.s: %.s: %.mid +$(MID_SUBDIR)/se_orb.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 -$(MID_SUBDIR)/se_tamago.s: %.s: %.mid +$(MID_SUBDIR)/se_egg_hatch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 -$(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid +$(MID_SUBDIR)/se_roulette_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 -$(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid +$(MID_SUBDIR)/se_roulette_ball2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 -$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_tb_start.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_enter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid +$(MID_SUBDIR)/se_click.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid +$(MID_SUBDIR)/se_warp_in.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid +$(MID_SUBDIR)/se_warp_out.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_toreeye.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_call.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5 -$(MID_SUBDIR)/se_toreoff.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_hang_up.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5 -$(MID_SUBDIR)/se_toy_a.s: %.s: %.mid +$(MID_SUBDIR)/se_note_a.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_b.s: %.s: %.mid +$(MID_SUBDIR)/se_note_b.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_c.s: %.s: %.mid +$(MID_SUBDIR)/se_note_c.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid +$(MID_SUBDIR)/se_note_c_high.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_d.s: %.s: %.mid +$(MID_SUBDIR)/se_note_d.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_dango.s: %.s: %.mid +$(MID_SUBDIR)/se_mud_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_e.s: %.s: %.mid +$(MID_SUBDIR)/se_note_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_f.s: %.s: %.mid +$(MID_SUBDIR)/se_note_f.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_g.s: %.s: %.mid +$(MID_SUBDIR)/se_note_g.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid +$(MID_SUBDIR)/se_breakable_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_track_door.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_unload.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 -$(MID_SUBDIR)/se_track_move.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_move.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid +$(MID_SUBDIR)/se_repel.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 $(MID_SUBDIR)/se_u.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_ussoki.s: %.s: %.mid +$(MID_SUBDIR)/se_sudowoodo_shake.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5 -$(MID_SUBDIR)/se_w003.s: %.s: %.mid +$(MID_SUBDIR)/se_m_double_slap.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w004.s: %.s: %.mid +$(MID_SUBDIR)/se_m_comet_punch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_w006.s: %.s: %.mid +$(MID_SUBDIR)/se_m_pay_day.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_w007.s: %.s: %.mid +$(MID_SUBDIR)/se_m_fire_punch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w010.s: %.s: %.mid +$(MID_SUBDIR)/se_m_scratch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w011.s: %.s: %.mid +$(MID_SUBDIR)/se_m_vicegrip.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w013.s: %.s: %.mid +$(MID_SUBDIR)/se_m_razor_wind.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w013b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_razor_wind2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_w014.s: %.s: %.mid +$(MID_SUBDIR)/se_m_swords_dance.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_w015.s: %.s: %.mid +$(MID_SUBDIR)/se_m_cut.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_w016.s: %.s: %.mid +$(MID_SUBDIR)/se_m_gust.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w016b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_gust2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w017.s: %.s: %.mid +$(MID_SUBDIR)/se_m_wing_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_w019.s: %.s: %.mid +$(MID_SUBDIR)/se_m_fly.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w020.s: %.s: %.mid +$(MID_SUBDIR)/se_m_bind.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_w025.s: %.s: %.mid +$(MID_SUBDIR)/se_m_mega_kick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_w025b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_mega_kick2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w026.s: %.s: %.mid +$(MID_SUBDIR)/se_m_jump_kick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w028.s: %.s: %.mid +$(MID_SUBDIR)/se_m_sand_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w029.s: %.s: %.mid +$(MID_SUBDIR)/se_m_headbutt.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w030.s: %.s: %.mid +$(MID_SUBDIR)/se_m_horn_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w036.s: %.s: %.mid +$(MID_SUBDIR)/se_m_take_down.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_w039.s: %.s: %.mid +$(MID_SUBDIR)/se_m_tail_whip.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w043.s: %.s: %.mid +$(MID_SUBDIR)/se_m_leer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_z_search.s: %.s: %.mid +$(MID_SUBDIR)/se_dex_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -v100 -P5 diff --git a/sound/song_table.inc b/sound/song_table.inc index 42e62b832f..ef5b4b48ec 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -2,275 +2,275 @@ gSongTable:: @ 86B49F0 song mus_dummy, 0, 0 - song se_kaifuku, 1, 1 @ Healing Item - song se_pc_login, 1, 1 @ PC Login - song se_pc_off, 1, 1 @ PC Shutdown - song se_pc_on, 1, 1 @ PC Startup - song se_select, 2, 2 @ Cursor Selection - song se_win_open, 1, 1 @ Start Menu - song se_wall_hit, 2, 2 @ Wall Bump - song se_door, 1, 1 @ Opening Door - song se_kaidan, 1, 1 @ Stairs - song se_dansa, 1, 1 @ Ledge - song se_jitensya, 1, 1 @ Bicycle Bell - song se_kouka_l, 1, 1 @ Not Very Effective - song se_kouka_m, 1, 1 @ Normal Effectiveness - song se_kouka_h, 1, 1 @ Super Effective - song se_bowa2, 1, 1 @ Pokémon Withdrawal - song se_poke_dead, 1, 1 @ Pokémon Fainted - song se_nigeru, 1, 1 @ Flee from Wild Battle - song se_jido_doa, 1, 1 @ Pokémon Center Door - song se_naminori, 1, 1 @ Briney's Ship - song se_ban, 1, 1 @ Bang - song se_pin, 1, 1 @ Exclamation Bubble - song se_boo, 1, 1 @ Contest Jam - song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball Wiggle - song se_jyuni, 2, 2 @ Contest - Rankings Revealed - song se_a, 1, 1 @ Bard A - song se_i, 1, 1 @ Bard I - song se_u, 1, 1 @ Bard U - song se_e, 1, 1 @ Bard E - song se_o, 1, 1 @ Bard O - song se_n, 1, 1 @ Bard N - song se_seikai, 1, 1 @ Success - song se_hazure, 1, 1 @ Failure - song se_exp, 1, 1 @ Exp. Bar - song se_jite_pyoko, 1, 1 @ Bunny Hop - song se_mu_pachi, 1, 1 @ Toggle Switch - song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch + song se_use_item, 1, 1 + song se_pc_login, 1, 1 + song se_pc_off, 1, 1 + song se_pc_on, 1, 1 + song se_select, 2, 2 + song se_win_open, 1, 1 + song se_wall_hit, 2, 2 + song se_door, 1, 1 + song se_exit, 1, 1 + song se_ledge, 1, 1 + song se_bike_bell, 1, 1 + song se_not_effective, 1, 1 + song se_effective, 1, 1 + song se_super_effective, 1, 1 + song se_ball_open, 1, 1 + song se_faint, 1, 1 + song se_flee, 1, 1 + song se_sliding_door, 1, 1 + song se_ship, 1, 1 + song se_bang, 1, 1 + song se_pin, 1, 1 + song se_boo, 1, 1 + song se_ball, 1, 1 + song se_contest_place, 2, 2 + song se_a, 1, 1 + song se_i, 1, 1 + song se_u, 1, 1 + song se_e, 1, 1 + song se_o, 1, 1 + song se_n, 1, 1 + song se_success, 1, 1 + song se_failure, 1, 1 + song se_exp, 1, 1 + song se_bike_hop, 1, 1 + song se_switch, 1, 1 + song se_click, 1, 1 song se_fu_zaku, 1, 1 - song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym - Warp - song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear - song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking - song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice - song se_ru_hyuu, 1, 1 @ Falling Down a Hole - song se_ki_gasyan, 2, 2 - song se_tk_warpin, 1, 1 @ Warp In - song se_tk_warpout, 1, 1 @ Warp Out - song se_tu_saa, 1, 1 @ Repel - song se_hi_turun, 1, 1 @ Fortree Gym - Obstacle - song se_track_move, 1, 1 @ Moving Truck - song se_track_stop, 1, 1 @ Moving Truck Stop - song se_track_haiki, 2, 2 @ Moving Truck Unload - song se_track_door, 1, 1 @ Moving Truck Door - song se_moter, 2, 2 + song se_contest_condition_lose, 1, 1 + song se_lavaridge_fall_warp, 1, 1 + song se_ice_stairs, 1, 1 + song se_ice_break, 1, 1 + song se_ice_crack, 1, 1 + song se_fall, 1, 1 + song se_unlock, 2, 2 + song se_warp_in, 1, 1 + song se_warp_out, 1, 1 + song se_repel, 1, 1 + song se_rotating_gate, 1, 1 + song se_truck_move, 1, 1 + song se_truck_stop, 1, 1 + song se_truck_unload, 2, 2 + song se_truck_door, 1, 1 + song se_berry_blender, 2, 2 song se_card, 1, 1 - song se_save, 1, 1 @ Save - song se_kon, 1, 1 @ Poké Ball Bounce 1 - song se_kon2, 1, 1 @ Poké Ball Bounce 2 - song se_kon3, 1, 1 @ Poké Ball Bounce 3 - song se_kon4, 1, 1 @ Poké Ball Bounce 4 - song se_suikomu, 2, 2 @ Poké Ball Trade - song se_nageru, 1, 1 @ Poké Ball Throw - song se_toy_c, 2, 2 @ Note C - song se_toy_d, 2, 2 @ Note D - song se_toy_e, 2, 2 @ Note E - song se_toy_f, 2, 2 @ Note F - song se_toy_g, 2, 2 @ Note G - song se_toy_a, 2, 2 @ Note A - song se_toy_b, 2, 2 @ Note B - song se_toy_c1, 2, 2 @ Note High C - song se_mizu, 2, 2 @ Puddle - song se_hashi, 2, 2 @ Fortree Walkways - song se_daugi, 1, 1 @ Slots - Credits - song se_pinpon, 1, 1 @ Elevator - Reached Destination - song se_fuusen1, 2, 2 @ Red Balloon - song se_fuusen2, 2, 2 @ Blue Balloon - song se_fuusen3, 2, 2 @ Yellow Balloon - song se_toy_kabe, 2, 2 @ Breakable Door - song se_toy_dango, 2, 2 @ Mud Ball - song se_doku, 1, 1 @ Overworld - Poison Damage - song se_esuka, 1, 1 @ Escalator - song se_t_ame, 3, 3 @ Rain - song se_t_ame_e, 3, 3 @ Rain Stop - song se_t_ooame, 3, 3 @ Heavy Rain - song se_t_ooame_e, 3, 3 @ Heavy Rain Stop - song se_t_koame, 3, 3 @ Light Rain - song se_t_koame_e, 3, 3 @ Light Rain Stop - song se_t_kami, 1, 1 @ Thunder - song se_t_kami2, 1, 1 @ Thunder 2 - song se_elebeta, 1, 1 @ Elevator - song se_hinsi, 3, 3 @ Low Health - song se_expmax, 1, 1 @ Exp. Max - song se_tamakoro, 2, 2 @ Roulette Ball - song se_tamakoro_e, 2, 2 @ Roulette Ball 2 - song se_basabasa, 1, 1 @ Wing Attack - song se_regi, 1, 1 @ Cash Register - song se_c_gaji, 1, 1 @ Contest - Hearts - song se_c_maku_u, 1, 1 @ Contest - Curtain Rises - song se_c_maku_d, 1, 1 @ Contest - Curtain Falls - song se_c_pasi, 1, 1 @ Contest - Inflict Status - song se_c_syu, 1, 1 @ Contest - Pokémon Switches Out - song se_c_pikon, 1, 1 @ Contest - Pokémon Switches In - song se_reapoke, 1, 1 @ Shiny Pokémon - song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen Transition - song se_bt_start, 1, 1 @ Battle Mugshot whoosh - song se_dendou, 1, 1 @ Audience Cheering - song se_jihanki, 1, 1 @ Vending Machine - song se_tama, 1, 1 @ Orb Used - song se_z_scroll, 1, 1 @ Pokédex Scrolling - song se_z_page, 1, 1 @ Pokédex Page - song se_pn_on, 1, 1 @ PokéNav On - song se_pn_off, 1, 1 @ PokéNav Off - song se_z_search, 1, 1 @ Pokédex Search - song se_tamago, 1, 1 @ Egg hatch - song se_tb_start, 1, 1 @ Battle - Poké Ball Tray slide in - song se_tb_kon, 1, 1 @ Battle - Poké Ball Tray ball sound - song se_tb_kara, 2, 2 @ Battle - Poké Ball Tray slide out - song se_bidoro, 1, 1 - song se_w085, 2, 2 @ Thunderbolt - song se_w085b, 1, 1 @ Thunderbolt 2 - song se_w231, 1, 1 @ Harden - song se_w171, 1, 1 @ Nightmare - song se_w233, 1, 1 @ Vital Throw - song se_w233b, 1, 1 @ Vital Throw 2 - song se_w145, 1, 1 @ Bubble - song se_w145b, 1, 1 @ Bubble 2 - song se_w145c, 1, 1 @ Bubble 3 - song se_w240, 1, 1 @ Rain Dance - song se_w015, 1, 1 @ Cut - song se_w081, 1, 1 @ String Shot - song se_w081b, 1, 1 @ String Shot 2 - song se_w088, 1, 1 @ Rock Throw - song se_w016, 2, 2 @ Gust - song se_w016b, 2, 2 @ Gust 2 - song se_w003, 1, 1 @ DoubleSlap - song se_w104, 1, 1 @ Double Team - song se_w013, 1, 1 @ Razor Wind - song se_w196, 1, 1 @ Icy Wind - song se_w086, 1, 1 @ Thunder Wave - song se_w004, 1, 1 @ Comet Punch - song se_w025, 1, 1 @ Mega Kick - song se_w025b, 1, 1 @ Mega Kick 2 - song se_w152, 1, 1 @ Crabhammer - song se_w026, 1, 1 @ Jump Kick - song se_w172, 1, 1 @ Flame Wheel - song se_w172b, 1, 1 @ Flame Wheel 2 - song se_w053, 1, 1 @ Flamethrower - song se_w007, 1, 1 @ Fire Punch - song se_w092, 1, 1 @ Toxic - song se_w221, 1, 1 @ Sacred Fire - song se_w221b, 2, 2 @ Sacred Fire 2 - song se_w052, 1, 1 @ Ember - song se_w036, 2, 2 @ Take Down - song se_w059, 1, 1 @ Blizzard - song se_w059b, 1, 1 @ Blizzard 2 - song se_w010, 1, 1 @ Scratch - song se_w011, 1, 1 @ Vicegrip - song se_w017, 1, 1 @ Wing Attack - song se_w019, 1, 1 @ Fly - song se_w028, 1, 1 @ Sand-Attack - song se_w013b, 1, 1 @ Razor Wind 2 - song se_w044, 1, 1 @ Bite - song se_w029, 1, 1 @ Headbutt - song se_w057, 1, 1 @ Surf - song se_w056, 1, 1 @ Hydro Pump - song se_w250, 1, 1 @ Whirlpool - song se_w030, 1, 1 @ Horn Attack - song se_w039, 2, 2 @ Tail Whip - song se_w054, 1, 1 @ Mist - song se_w077, 1, 1 @ PoisonPowder - song se_w020, 2, 2 @ Bind - song se_w082, 1, 1 @ Dragon Rage - song se_w047, 1, 1 @ Sing - song se_w195, 1, 1 @ Perish Song - song se_w006, 1, 1 @ Pay Day - song se_w091, 1, 1 @ Dig - song se_w146, 1, 1 @ Dizzy Punch - song se_w120, 1, 1 @ Self-Destruct - song se_w153, 1, 1 @ Explosion - song se_w071b, 1, 1 @ Absorb 2 - song se_w071, 1, 1 @ Absorb - song se_w103, 1, 1 @ Screech - song se_w062, 1, 1 @ BubbleBeam - song se_w062b, 1, 1 @ BubbleBeam 2 - song se_w048, 1, 1 @ Supersonic - song se_w187, 1, 1 @ Belly Drum - song se_w118, 1, 1 @ Metronome - song se_w155, 1, 1 @ Bonemerang - song se_w122, 1, 1 @ Lick - song se_w060, 1, 1 @ Psybeam - song se_w185, 1, 1 @ Faint Attack - song se_w014, 1, 1 @ Swords Dance - song se_w043, 1, 1 @ Leer - song se_w207, 1, 1 @ Swagger - song se_w207b, 1, 1 @ Swagger 2 - song se_w215, 1, 1 @ Heal Bell - song se_w109, 1, 1 @ Confuse Ray - song se_w173, 1, 1 @ Snore - song se_w280, 1, 1 @ Brick Break - song se_w202, 1, 1 @ Giga Drain - song se_w060b, 1, 1 @ Psybeam 2 - song se_w076, 2, 2 @ SolarBeam - song se_w080, 1, 1 @ Petal Dance - song se_w100, 1, 1 @ Teleport - song se_w107, 1, 1 @ Minimize - song se_w166, 1, 1 @ Sketch - song se_w129, 1, 1 @ Swift - song se_w115, 1, 1 @ Reflect - song se_w112, 1, 1 @ Barrier - song se_w197, 2, 2 @ Detect - song se_w199, 1, 1 @ Lock-On - song se_w236, 1, 1 @ Moonlight - song se_w204, 1, 1 @ Charm - song se_w268, 1, 1 @ Charge - song se_w070, 1, 1 @ Strength - song se_w063, 1, 1 @ Hyper Beam - song se_w127, 1, 1 @ Waterfall - song se_w179, 1, 1 @ Reversal - song se_w151, 1, 1 @ Acid Armor - song se_w201, 1, 1 @ Sandstorm - song se_w161, 1, 1 @ Tri-Attack - song se_w161b, 1, 1 @ Tri-Attack 2 - song se_w227, 1, 1 @ Encore - song se_w227b, 2, 2 @ Encore 2 - song se_w226, 1, 1 @ Baton Pass - song se_w208, 1, 1 @ Milk Drink - song se_w213, 1, 1 @ Attract - song se_w213b, 1, 1 @ Attract 2 - song se_w234, 1, 1 @ Morning Sun - song se_w260, 1, 1 @ Flatter - song se_w328, 1, 1 @ Sand Tomb - song se_w320, 1, 1 @ GrassWhistle - song se_w255, 1, 1 @ Spit Up - song se_w291, 1, 1 @ Dive - song se_w089, 2, 2 @ Earthquake - song se_w239, 2, 2 @ Twister - song se_w230, 1, 1 @ Sweet Scent - song se_w281, 1, 1 @ Yawn - song se_w327, 2, 2 @ Sky Uppercut - song se_w287, 1, 1 @ Stat Increased - song se_w257, 1, 1 @ Heat Wave - song se_w253, 1, 1 @ Uproar - song se_w258, 1, 1 @ Hail - song se_w322, 2, 2 @ Cosmic Power - song se_w298, 1, 1 @ Teeter Dance - song se_w287b, 1, 1 @ Stat Decreased - song se_w114, 1, 1 @ Haze - song se_w063b, 1, 1 @ Hyper Beam 2 - song se_rg_w_door, 1, 1 @ Door (FRLG) - song se_rg_card1, 1, 1 @ Trainer Card 1 (FRLG) - song se_rg_card2, 1, 1 @ Trainer Card 2 (FRLG) - song se_rg_card3, 1, 1 @ Trainer Card 3 (FRLG) - song se_rg_bag1, 1, 1 @ Bag Scroll (FRLG) - song se_rg_bag2, 1, 1 @ Bag Pocket Change (FRLG) - song se_rg_getting, 1, 1 - song se_rg_shop, 1, 1 @ Cash Register (FRLG) - song se_rg_kiteki, 1, 1 @ S.S. Anne Horn (FRLG) - song se_rg_help_op, 1, 1 @ Help Menu Open (FRLG) - song se_rg_help_cl, 1, 1 @ Help Menu Close (FRLG) - song se_rg_help_ng, 1, 1 @ Help Menu Error (FRLG) - song se_rg_deomov, 1, 1 @ Deoxys Moves - song se_rg_excellent, 1, 1 @ HP Restored (FRLG) - song se_rg_nawamiss, 1, 1 - song se_toreeye, 1, 1 @ Trainer's Eye Call - song se_toreoff, 1, 1 @ Trainer's Eye Hang Up - song se_hantei1, 1, 1 @ Battle Arena - Judgment 1 - song se_hantei2, 1, 1 @ Battle Arena - Judgment 2 - song se_curtain, 1, 1 @ Battle Pike - Curtain Opens - song se_curtain1, 1, 1 @ Battle Pike - Curtain Closes - song se_ussoki, 1, 1 @ Sudowoodo + song se_save, 1, 1 + song se_ball_bounce_1, 1, 1 + song se_ball_bounce_2, 1, 1 + song se_ball_bounce_3, 1, 1 + song se_ball_bounce_4, 1, 1 + song se_ball_trade, 2, 2 + song se_ball_throw, 1, 1 + song se_note_c, 2, 2 + song se_note_d, 2, 2 + song se_note_e, 2, 2 + song se_note_f, 2, 2 + song se_note_g, 2, 2 + song se_note_a, 2, 2 + song se_note_b, 2, 2 + song se_note_c_high, 2, 2 + song se_puddle, 2, 2 + song se_bridge_walk, 2, 2 + song se_itemfinder, 1, 1 + song se_ding_dong, 1, 1 + song se_balloon_red, 2, 2 + song se_balloon_blue, 2, 2 + song se_balloon_yellow, 2, 2 + song se_breakable_door, 2, 2 + song se_mud_ball, 2, 2 + song se_field_poison, 1, 1 + song se_escalator, 1, 1 + song se_thunderstorm, 3, 3 + song se_thunderstorm_stop, 3, 3 + song se_downpour, 3, 3 + song se_downpour_stop, 3, 3 + song se_rain, 3, 3 + song se_rain_stop, 3, 3 + song se_thunder, 1, 1 + song se_thunder2, 1, 1 + song se_elevator, 1, 1 + song se_low_health, 3, 3 + song se_exp_max, 1, 1 + song se_roulette_ball, 2, 2 + song se_roulette_ball2, 2, 2 + song se_taillow_wing_flap, 1, 1 + song se_shop, 1, 1 + song se_contest_heart, 1, 1 + song se_contest_curtain_rise, 1, 1 + song se_contest_curtain_fall, 1, 1 + song se_contest_icon_change, 1, 1 + song se_contest_icon_clear, 1, 1 + song se_contest_mons_turn, 1, 1 + song se_shiny, 1, 1 + song se_intro_blast, 1, 1 + song se_mugshot, 1, 1 + song se_applause, 1, 1 + song se_vend, 1, 1 + song se_orb, 1, 1 + song se_dex_scroll, 1, 1 + song se_dex_page, 1, 1 + song se_pokenav_on, 1, 1 + song se_pokenav_off, 1, 1 + song se_dex_search, 1, 1 + song se_egg_hatch, 1, 1 + song se_ball_tray_enter, 1, 1 + song se_ball_tray_ball, 1, 1 + song se_ball_tray_exit, 2, 2 + song se_glass_flute, 1, 1 + song se_m_thunderbolt, 2, 2 + song se_m_thunderbolt2, 1, 1 + song se_m_harden, 1, 1 + song se_m_nightmare, 1, 1 + song se_m_vital_throw, 1, 1 + song se_m_vital_throw2, 1, 1 + song se_m_bubble, 1, 1 + song se_m_bubble2, 1, 1 + song se_m_bubble3, 1, 1 + song se_m_rain_dance, 1, 1 + song se_m_cut, 1, 1 + song se_m_string_shot, 1, 1 + song se_m_string_shot2, 1, 1 + song se_m_rock_throw, 1, 1 + song se_m_gust, 2, 2 + song se_m_gust2, 2, 2 + song se_m_double_slap, 1, 1 + song se_m_double_team, 1, 1 + song se_m_razor_wind, 1, 1 + song se_m_icy_wind, 1, 1 + song se_m_thunder_wave, 1, 1 + song se_m_comet_punch, 1, 1 + song se_m_mega_kick, 1, 1 + song se_m_mega_kick2, 1, 1 + song se_m_crabhammer, 1, 1 + song se_m_jump_kick, 1, 1 + song se_m_flame_wheel, 1, 1 + song se_m_flame_wheel2, 1, 1 + song se_m_flamethrower, 1, 1 + song se_m_fire_punch, 1, 1 + song se_m_toxic, 1, 1 + song se_m_sacred_fire, 1, 1 + song se_m_sacred_fire2, 2, 2 + song se_m_ember, 1, 1 + song se_m_take_down, 2, 2 + song se_m_blizzard, 1, 1 + song se_m_blizzard2, 1, 1 + song se_m_scratch, 1, 1 + song se_m_vicegrip, 1, 1 + song se_m_wing_attack, 1, 1 + song se_m_fly, 1, 1 + song se_m_sand_attack, 1, 1 + song se_m_razor_wind2, 1, 1 + song se_m_bite, 1, 1 + song se_m_headbutt, 1, 1 + song se_m_surf, 1, 1 + song se_m_hydro_pump, 1, 1 + song se_m_whirlpool, 1, 1 + song se_m_horn_attack, 1, 1 + song se_m_tail_whip, 2, 2 + song se_m_mist, 1, 1 + song se_m_poison_powder, 1, 1 + song se_m_bind, 2, 2 + song se_m_dragon_rage, 1, 1 + song se_m_sing, 1, 1 + song se_m_perish_song, 1, 1 + song se_m_pay_day, 1, 1 + song se_m_dig, 1, 1 + song se_m_dizzy_punch, 1, 1 + song se_m_self_destruct, 1, 1 + song se_m_explosion, 1, 1 + song se_m_absorb_2, 1, 1 + song se_m_absorb, 1, 1 + song se_m_screech, 1, 1 + song se_m_bubble_beam, 1, 1 + song se_m_bubble_beam2, 1, 1 + song se_m_supersonic, 1, 1 + song se_m_belly_drum, 1, 1 + song se_m_metronome, 1, 1 + song se_m_bonemerang, 1, 1 + song se_m_lick, 1, 1 + song se_m_psybeam, 1, 1 + song se_m_faint_attack, 1, 1 + song se_m_swords_dance, 1, 1 + song se_m_leer, 1, 1 + song se_m_swagger, 1, 1 + song se_m_swagger2, 1, 1 + song se_m_heal_bell, 1, 1 + song se_m_confuse_ray, 1, 1 + song se_m_snore, 1, 1 + song se_m_brick_break, 1, 1 + song se_m_giga_drain, 1, 1 + song se_m_psybeam2, 1, 1 + song se_m_solar_beam, 2, 2 + song se_m_petal_dance, 1, 1 + song se_m_teleport, 1, 1 + song se_m_minimize, 1, 1 + song se_m_sketch, 1, 1 + song se_m_swift, 1, 1 + song se_m_reflect, 1, 1 + song se_m_barrier, 1, 1 + song se_m_detect, 2, 2 + song se_m_lock_on, 1, 1 + song se_m_moonlight, 1, 1 + song se_m_charm, 1, 1 + song se_m_charge, 1, 1 + song se_m_strength, 1, 1 + song se_m_hyper_beam, 1, 1 + song se_m_waterfall, 1, 1 + song se_m_reversal, 1, 1 + song se_m_acid_armor, 1, 1 + song se_m_sandstorm, 1, 1 + song se_m_tri_attack, 1, 1 + song se_m_tri_attack2, 1, 1 + song se_m_encore, 1, 1 + song se_m_encore2, 2, 2 + song se_m_baton_pass, 1, 1 + song se_m_milk_drink, 1, 1 + song se_m_attract, 1, 1 + song se_m_attract2, 1, 1 + song se_m_morning_sun, 1, 1 + song se_m_flatter, 1, 1 + song se_m_sand_tomb, 1, 1 + song se_m_grasswhistle, 1, 1 + song se_m_spit_up, 1, 1 + song se_m_dive, 1, 1 + song se_m_earthquake, 2, 2 + song se_m_twister, 2, 2 + song se_m_sweet_scent, 1, 1 + song se_m_yawn, 1, 1 + song se_m_sky_uppercut, 2, 2 + song se_m_stat_increase, 1, 1 + song se_m_heat_wave, 1, 1 + song se_m_uproar, 1, 1 + song se_m_hail, 1, 1 + song se_m_cosmic_power, 2, 2 + song se_m_teeter_dance, 1, 1 + song se_m_stat_decrease, 1, 1 + song se_m_haze, 1, 1 + song se_m_hyper_beam2, 1, 1 + song se_rg_door, 1, 1 + song se_rg_card_flip, 1, 1 + song se_rg_card_flipping, 1, 1 + song se_rg_card_open, 1, 1 + song se_rg_bag_cursor, 1, 1 + song se_rg_bag_pocket, 1, 1 + song se_rg_ball_click, 1, 1 + song se_rg_shop, 1, 1 + song se_rg_ss_anne_horn, 1, 1 + song se_rg_help_open, 1, 1 + song se_rg_help_close, 1, 1 + song se_rg_help_error, 1, 1 + song se_rg_deoxys_move, 1, 1 + song se_rg_poke_jump_success, 1, 1 + song se_rg_poke_jump_failure, 1, 1 + song se_pokenav_call, 1, 1 + song se_pokenav_hang_up, 1, 1 + song se_arena_timeup1, 1, 1 + song se_arena_timeup2, 1, 1 + song se_pike_curtain_close, 1, 1 + song se_pike_curtain_open, 1, 1 + song se_sudowoodo_shake, 1, 1 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 @@ -351,215 +351,215 @@ gSongTable:: @ 86B49F0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 - song mus_tetsuji, 0, 0 @ Unused - TETSUJI - song mus_field13, 0, 0 @ Unused - Route 38 - song mus_kachi22, 0, 0 @ Victory! (Wild Pokémon) (No Intro) - song mus_kachi2, 0, 0 @ Victory! (Wild Pokémon) - song mus_kachi3, 0, 0 @ Victory! (Gym Leader) - song mus_kachi5, 0, 0 @ Victory! (Wallace) - song mus_pcc, 0, 0 @ Unused - Pokémon Center (2) - song mus_nibi, 0, 0 @ Unused - Viridian City - song mus_suikun, 0, 0 @ Unused - Battle! (Entei/Raikou/Suicune) - song mus_dooro1, 0, 0 @ Route 101 - song mus_dooro_x1, 0, 0 @ Route 110 - song mus_dooro_x3, 0, 0 @ Route 120 - song mus_machi_s2, 0, 0 @ Petalburg City - song mus_machi_s4, 0, 0 @ Oldale Town - song mus_gim, 0, 0 @ Pokémon Gym - song mus_naminori, 0, 0 @ Surf - song mus_dan01, 0, 0 @ Petalburg Woods - song mus_fanfa1, 2, 2 @ Level Up! - song mus_me_asa, 2, 2 @ Pokémon Healed - song mus_me_bachi, 2, 2 @ Obtained a Badge! - song mus_fanfa4, 2, 2 @ Obtained an Item! - song mus_fanfa5, 2, 2 @ Congratulations! Your Pokémon Evolved! - song mus_me_waza, 2, 2 @ Obtained a TM! - song mus_bijyutu, 0, 0 @ Museum - song mus_dooro_x4, 0, 0 @ Introductions - song mus_fune_kan, 0, 0 @ Oceanic Museum - song mus_me_shinka, 2, 2 @ Evolution (Intro) - song mus_shinka, 0, 0 @ Evolution - song mus_me_wasure, 2, 2 @ Move Deleted - song mus_syoujoeye, 0, 0 @ Trainers' Eyes Meet (Tuber♀) - song mus_boyeye, 0, 0 @ Trainers' Eyes Meet (Youngster) - song mus_dan02, 0, 0 @ Abandoned Ship - song mus_machi_s3, 0, 0 @ Fortree City - song mus_odamaki, 0, 0 @ Birch Pokémon Lab - song mus_b_tower, 0, 0 @ Battle Tower (RS) - song mus_swimeye, 0, 0 @ Trainers' Eyes Meet (Swimmer♀) - song mus_dan03, 0, 0 @ Cave of Origin - song mus_me_kinomi, 2, 2 @ Obtained a Berry! - song mus_me_tama, 2, 2 @ The Super-Ancient Pokémon Awaken! - song mus_me_b_big, 2, 2 @ Jackpot - song mus_me_b_small, 2, 2 @ Win - song mus_me_zannen, 2, 2 @ Lose - song mus_bd_time, 0, 0 @ Reel Time - song mus_test1, 0, 0 @ Pokémon Contest! (Multiplayer - Player 1) - song mus_test2, 0, 0 @ Pokémon Contest! (Multiplayer - Player 2) - song mus_test3, 0, 0 @ Pokémon Contest! (Multiplayer - Player 3) - song mus_test4, 0, 0 @ Pokémon Contest! (Multiplayer - Player 4) - song mus_test, 0, 0 @ Trainers' Eyes Meet (Gentleman) - song mus_gomachi0, 0, 0 @ Verdanturf Town - song mus_gotown, 0, 0 @ Rustboro City - song mus_pokecen, 0, 0 @ Pokémon Center - song mus_nextroad, 0, 0 @ Route 104 - song mus_granroad, 0, 0 @ Route 119 - song mus_cycling, 0, 0 @ Cycling - song mus_friendly, 0, 0 @ Poké Mart - song mus_mishiro, 0, 0 @ Littleroot Town - song mus_tozan, 0, 0 @ Mt. Chimney - song mus_girleye, 0, 0 @ Trainers' Eyes Meet (Lass) - song mus_minamo, 0, 0 @ Lilycove City - song mus_ashroad, 0, 0 @ Route 111 - song mus_event0, 0, 0 @ H-Help Me! - song mus_deepdeep, 0, 0 @ Dive - song mus_kachi1, 0, 0 @ Victory! (Trainer Battle) - song mus_title3, 0, 0 @ Title Screen - song mus_demo1, 0, 0 @ Opening Movie: Setting out on a Journey in the Hoenn Region - song mus_girl_sup, 0, 0 @ May - song mus_hageshii, 0, 0 @ Trainers' Eyes Meet (Psychic) - song mus_kakkoii, 0, 0 @ Trainers' Eyes Meet (Cooltrainer) - song mus_kazanbai, 0, 0 @ Route 113 - song mus_aqa_0, 0, 0 @ Team Aqua Appears! - song mus_tsuretek, 0, 0 @ Hurry Along - song mus_boy_sup, 0, 0 @ Brendan - song mus_rainbow, 0, 0 @ Evergrande City - song mus_ayasii, 0, 0 @ Trainers' Eyes Meet (Hex Maniac) - song mus_kachi4, 0, 0 @ Victory! (Team Aqua / Team Magma) - song mus_ropeway, 0, 0 @ Cable Car - song mus_casino, 0, 0 @ Game Corner - song mus_hightown, 0, 0 @ Dewford Town - song mus_safari, 0, 0 @ Safari Zone - song mus_c_road, 0, 0 @ Victory Road - song mus_ajito, 0, 0 @ Hideout - song mus_m_boat, 0, 0 @ Crossing the Sea - song mus_m_dungon, 0, 0 @ Mt. Pyre - song mus_finecity, 0, 0 @ Slateport City - song mus_machupi, 0, 0 @ Mt. Pyre Exterior - song mus_p_school, 0, 0 @ Trainers' School - song mus_dendou, 0, 0 @ The Hall of Fame - song mus_tonekusa, 0, 0 @ Fallarbor Town - song mus_maborosi, 0, 0 @ Sealed Chamber - song mus_con_fan, 0, 0 @ Contest Winner - song mus_contest0, 0, 0 @ Pokémon Contest! - song mus_mgm0, 0, 0 @ Team Magma Appears! - song mus_t_battle, 0, 0 @ Opening Movie: Double Battles - song mus_ooame, 0, 0 @ Heavy Rain - song mus_hideri, 0, 0 @ The Drought - song mus_runecity, 0, 0 @ Sootopolis City - song mus_con_k, 0, 0 @ Results Announcement - song mus_eikou_r, 0, 0 @ Room of Glory - song mus_karakuri, 0, 0 @ The Trick House - song mus_hutago, 0, 0 @ Twins - song mus_sitennou, 0, 0 @ The Elite Four Appear! - song mus_yama_eye, 0, 0 @ Trainers' Eyes Meet (Hiker) - song mus_conlobby, 0, 0 @ Contest Lobby - song mus_inter_v, 0, 0 @ Interviewers - song mus_daigo, 0, 0 @ Champion Wallace - song mus_thankfor, 0, 0 @ Ending Theme - song mus_end, 0, 0 @ The End - song mus_b_frontier, 0, 0 @ Battle Frontier - song mus_b_arena, 0, 0 @ Battle Arena - song mus_me_pointget, 2, 2 @ Obtained a Battle Point! - song mus_me_tore_eye, 2, 2 @ Registered Trainer! - song mus_pyramid, 0, 0 @ Battle Pyramid - song mus_pyramid_top, 0, 0 @ Battle Pyramid Summit - song mus_b_palace, 0, 0 @ Battle Palace - song mus_rekkuu_kourin, 0, 0 @ Rayquaza Enters! - song mus_sattower, 0, 0 @ Battle Tower - song mus_me_symbolget, 2, 2 @ Obtained a Frontier Symbol! - song mus_b_dome, 0, 0 @ Battle Dome - song mus_b_tube, 0, 0 @ Battle Pike - song mus_b_factory, 0, 0 @ Battle Factory - song mus_vs_rekku, 0, 0 @ Battle! (Rayquaza) - song mus_vs_front, 0, 0 @ Battle! (Frontier Brain) - song mus_vs_mew, 0, 0 @ Battle! (Mew) - song mus_b_dome1, 0, 0 @ Battle Dome Lobby - song mus_battle27, 0, 0 @ Battle! (Wild Pokémon) - song mus_battle31, 0, 0 @ Battle! (Team Aqua / Team Magma) - song mus_battle20, 0, 0 @ Battle! (Trainer Battle) - song mus_battle32, 0, 0 @ Battle! (Gym Leader) - song mus_battle33, 0, 0 @ Battle! (Champion Wallace) - song mus_battle36, 0, 0 @ Battle! (Regirock/Regice/Registeel) - song mus_battle34, 0, 0 @ Battle! (Groudon/Kyogre) - song mus_battle35, 0, 0 @ Battle! (Brendan/May/Steven) - song mus_battle38, 0, 0 @ Battle! (Elite Four) - song mus_battle30, 0, 0 @ Battle! (Team Aqua/Team Magma Leaders) - song mus_rg_annai, 0, 0 @ Guide (FRLG) - song mus_rg_slot, 0, 0 @ Rocket Game Corner (FRLG) - song mus_rg_ajito, 0, 0 @ Rocket Hideout (FRLG) - song mus_rg_gym, 0, 0 @ Pokémon Gym (FRLG) - song mus_rg_purin, 2, 2 @ Jigglypuff's Song (FRLG) - song mus_rg_demo, 0, 0 @ Opening Movie (FRLG) - song mus_rg_title, 0, 0 @ Title Screen (FRLG) - song mus_rg_guren, 0, 0 @ Cinnabar Island Theme (FRLG) - song mus_rg_shion, 0, 0 @ Lavender Town Theme (FRLG) - song mus_rg_kaihuku, 0, 0 @ Pokémon Healed (FRLG) - song mus_rg_cycling, 0, 0 @ Cycling (FRLG) - song mus_rg_rocket, 0, 0 @ A Trainer Appears (Bad Guy Version) (FRLG) - song mus_rg_shoujo, 0, 0 @ A Trainer Appears (Girl Version) (FRLG) - song mus_rg_shounen, 0, 0 @ A Trainer Appears (Boy Version) (FRLG) - song mus_rg_dendou, 0, 0 @ Hall of Fame (FRLG) - song mus_rg_t_mori, 0, 0 @ Viridian Forest (FRLG) - song mus_rg_otsukimi, 0, 0 @ Navel Rock - song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion (FRLG) - song mus_rg_ending, 0, 0 @ Ending Theme (FRLG) - song mus_rg_load01, 0, 0 @ Road to Viridian City: Leaving Pallet Town (FRLG) - song mus_rg_opening, 0, 0 @ Welcome to the World of Pokémon! (FRLG) - song mus_rg_load02, 0, 0 @ Road to Cerulean City: Leaving Mt. Moon (FRLG) - song mus_rg_load03, 0, 0 @ Road to Fuchsia City: Leaving Lavender Town (FRLG) - song mus_rg_champ_r, 0, 0 @ The Final Road (FRLG) - song mus_rg_vs_gym, 0, 0 @ Battle! (Gym Leader Battle) (FRLG) - song mus_rg_vs_tore, 0, 0 @ Battle! (Trainer Battle) (FRLG) - song mus_rg_vs_yasei, 0, 0 @ Battle! (Wild Pokémon) (FRLG) - song mus_rg_vs_last, 0, 0 @ Final Battle! (Rival) (FRLG) - song mus_rg_masara, 0, 0 @ Pallet Town Theme (FRLG) - song mus_rg_kenkyu, 0, 0 @ Professor Oak's Laboratory (FRLG) - song mus_rg_ohkido, 0, 0 @ Professor Oak (FRLG) - song mus_rg_pokecen, 0, 0 @ Pokémon Center (FRLG) - song mus_rg_santoan, 0, 0 @ The S.S. Anne (FRLG) - song mus_rg_naminori, 0, 0 @ The Sea (FRLG) - song mus_rg_p_tower, 0, 0 @ Pokémon Tower (FRLG) - song mus_rg_shiruhu, 0, 0 @ Silph Co. (FRLG) - song mus_rg_hanada, 0, 0 @ Fuchsia City Theme (FRLG) - song mus_rg_tamamusi, 0, 0 @ Celadon City Theme (FRLG) - song mus_rg_win_tre, 0, 0 @ Victory! (Trainer Battle) (FRLG) - song mus_rg_win_yasei, 0, 0 @ Victory! (Wild Pokémon) (FRLG) - song mus_rg_win_gym, 0, 0 @ Victory! (Gym Leader Battle) (FRLG) - song mus_rg_kuchiba, 0, 0 @ Vermillion City Theme (FRLG) - song mus_rg_nibi, 0, 0 @ Pewter City Theme (FRLG) - song mus_rg_rival1, 0, 0 @ A Rival Appears (FRLG) - song mus_rg_rival2, 0, 0 @ A Rival Appears (No Intro) (FRLG) - song mus_rg_fan2, 2, 2 @ Fanfare: Professor Oak's Evaluation (FRLG) - song mus_rg_fan5, 2, 2 @ Fanfare: Pokémon Obtained (FRLG) - song mus_rg_fan6, 2, 2 @ Fanfare: Pokémon Caught - song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG) - song mus_rg_titlerog, 0, 0 @ Game Freak Logo (FRLG) - song mus_rg_get_yasei, 0, 0 @ Fanfare: Pokémon Caught (No Intro) (FRLG) - song mus_rg_sousa, 0, 0 @ Game Tutorial (1) (FRLG) - song mus_rg_sekaikan, 0, 0 @ Game Tutorial (2) (FRLG) - song mus_rg_seibetu, 0, 0 @ Game Tutorial (3) (FRLG) - song mus_rg_jump, 0, 0 @ Pokémon Jump (FRLG) - song mus_rg_union, 0, 0 @ The Union Room (FRLG) - song mus_rg_network, 0, 0 @ Pokémon Net Center (FRLG) - song mus_rg_okurimono, 0, 0 @ Mystery Gift (FRLG) - song mus_rg_kinomikui, 0, 0 @ Dodrio Berry Picking (FRLG) - song mus_rg_nanadungeon, 0, 0 @ Mt. Ember (FRLG) - song mus_rg_oshie_tv, 0, 0 @ Teachy TV Lesson (FRLG) - song mus_rg_nanashima, 0, 0 @ Sevii Islands (FRLG) - song mus_rg_nanaiseki, 0, 0 @ Tanoby Chambers (FRLG) - song mus_rg_nana123, 0, 0 @ Sevii Islands: One, Two & Three Islands (FRLG) - song mus_rg_nana45, 0, 0 @ Sevii Islands: Four & Five Islands (FRLG) - song mus_rg_nana67, 0, 0 @ Sevii Islands: Six & Seven Islands (FRLG) - song mus_rg_pokefue, 2, 2 @ The Poké Flute (FRLG) - song mus_rg_vs_deo, 0, 0 @ Battle! (Deoxys) - song mus_rg_vs_myu2, 0, 0 @ Battle! (Mewtwo) (FRLG) - song mus_rg_vs_den, 0, 0 @ Battle! (Ho-Oh/Lugia) - song mus_rg_exeye, 0, 0 @ Tense Battle! (FRLG) - song mus_rg_deoeye, 0, 0 @ Deoxys Appears - song mus_rg_t_tower, 0, 0 @ Trainer Tower (FRLG) - song mus_rg_slowmasara, 0, 0 @ Epilogue (FRLG) - song mus_rg_tvnoize, 0, 0 @ Teachy TV Menu (FRLG) + song mus_littleroot_test, 0, 0 + song mus_gsc_route38, 0, 0 + song mus_caught, 0, 0 + song mus_victory_wild, 0, 0 + song mus_victory_gym_leader, 0, 0 + song mus_victory_league, 0, 0 + song mus_c_comm_center, 0, 0 + song mus_gsc_pewter, 0, 0 + song mus_c_vs_legend_beast, 0, 0 + song mus_route101, 0, 0 + song mus_route110, 0, 0 + song mus_route120, 0, 0 + song mus_petalburg, 0, 0 + song mus_oldale, 0, 0 + song mus_gym, 0, 0 + song mus_surf, 0, 0 + song mus_petalburg_woods, 0, 0 + song mus_level_up, 2, 2 + song mus_heal, 2, 2 + song mus_obtain_badge, 2, 2 + song mus_obtain_item, 2, 2 + song mus_evolved, 2, 2 + song mus_obtain_tmhm, 2, 2 + song mus_lilycove_museum, 0, 0 + song mus_route122, 0, 0 + song mus_oceanic_museum, 0, 0 + song mus_evolution_intro, 2, 2 + song mus_evolution, 0, 0 + song mus_move_deleted, 2, 2 + song mus_encounter_girl, 0, 0 + song mus_encounter_male, 0, 0 + song mus_abandoned_ship, 0, 0 + song mus_fortree, 0, 0 + song mus_birch_lab, 0, 0 + song mus_b_tower_rs, 0, 0 + song mus_encounter_swimmer, 0, 0 + song mus_cave_of_origin, 0, 0 + song mus_obtain_berry, 2, 2 + song mus_awaken_legend, 2, 2 + song mus_slots_jackpot, 2, 2 + song mus_slots_win, 2, 2 + song mus_too_bad, 2, 2 + song mus_roulette, 0, 0 + song mus_link_contest_p1, 0, 0 + song mus_link_contest_p2, 0, 0 + song mus_link_contest_p3, 0, 0 + song mus_link_contest_p4, 0, 0 + song mus_encounter_rich, 0, 0 + song mus_verdanturf, 0, 0 + song mus_rustboro, 0, 0 + song mus_poke_center, 0, 0 + song mus_route104, 0, 0 + song mus_route119, 0, 0 + song mus_cycling, 0, 0 + song mus_poke_mart, 0, 0 + song mus_littleroot, 0, 0 + song mus_mt_chimney, 0, 0 + song mus_encounter_female, 0, 0 + song mus_lilycove, 0, 0 + song mus_route111, 0, 0 + song mus_help, 0, 0 + song mus_underwater, 0, 0 + song mus_victory_trainer, 0, 0 + song mus_title, 0, 0 + song mus_intro, 0, 0 + song mus_encounter_may, 0, 0 + song mus_encounter_intense, 0, 0 + song mus_encounter_cool, 0, 0 + song mus_route113, 0, 0 + song mus_encounter_aqua, 0, 0 + song mus_follow_me, 0, 0 + song mus_encounter_brendan, 0, 0 + song mus_ever_grande, 0, 0 + song mus_encounter_suspicious, 0, 0 + song mus_victory_aqua_magma, 0, 0 + song mus_cable_car, 0, 0 + song mus_game_corner, 0, 0 + song mus_dewford, 0, 0 + song mus_safari_zone, 0, 0 + song mus_victory_road, 0, 0 + song mus_aqua_magma_hideout, 0, 0 + song mus_sailing, 0, 0 + song mus_mt_pyre, 0, 0 + song mus_slateport, 0, 0 + song mus_mt_pyre_exterior, 0, 0 + song mus_school, 0, 0 + song mus_hall_of_fame, 0, 0 + song mus_fallarbor, 0, 0 + song mus_sealed_chamber, 0, 0 + song mus_contest_winner, 0, 0 + song mus_contest, 0, 0 + song mus_encounter_magma, 0, 0 + song mus_intro_battle, 0, 0 + song mus_abnormal_weather, 0, 0 + song mus_weather_groudon, 0, 0 + song mus_sootopolis, 0, 0 + song mus_contest_results, 0, 0 + song mus_hall_of_fame_room, 0, 0 + song mus_trick_house, 0, 0 + song mus_encounter_twins, 0, 0 + song mus_encounter_elite_four, 0, 0 + song mus_encounter_hiker, 0, 0 + song mus_contest_lobby, 0, 0 + song mus_encounter_interviewer, 0, 0 + song mus_encounter_champion, 0, 0 + song mus_credits, 0, 0 + song mus_end, 0, 0 + song mus_b_frontier, 0, 0 + song mus_b_arena, 0, 0 + song mus_obtain_b_points, 2, 2 + song mus_register_match_call, 2, 2 + song mus_b_pyramid, 0, 0 + song mus_b_pyramid_top, 0, 0 + song mus_b_palace, 0, 0 + song mus_rayquaza_appears, 0, 0 + song mus_b_tower, 0, 0 + song mus_obtain_symbol, 2, 2 + song mus_b_dome, 0, 0 + song mus_b_pike, 0, 0 + song mus_b_factory, 0, 0 + song mus_vs_rayquaza, 0, 0 + song mus_vs_frontier_brain, 0, 0 + song mus_vs_mew, 0, 0 + song mus_b_dome_lobby, 0, 0 + song mus_vs_wild, 0, 0 + song mus_vs_aqua_magma, 0, 0 + song mus_vs_trainer, 0, 0 + song mus_vs_gym_leader, 0, 0 + song mus_vs_champion, 0, 0 + song mus_vs_regi, 0, 0 + song mus_vs_kyogre_groudon, 0, 0 + song mus_vs_rival, 0, 0 + song mus_vs_elite_four, 0, 0 + song mus_vs_aqua_magma_leader, 0, 0 + song mus_rg_follow_me, 0, 0 + song mus_rg_game_corner, 0, 0 + song mus_rg_rocket_hideout, 0, 0 + song mus_rg_gym, 0, 0 + song mus_rg_jigglypuff, 2, 2 + song mus_rg_intro_fight, 0, 0 + song mus_rg_title, 0, 0 + song mus_rg_cinnabar, 0, 0 + song mus_rg_lavender, 0, 0 + song mus_rg_heal, 0, 0 + song mus_rg_cycling, 0, 0 + song mus_rg_encounter_rocket, 0, 0 + song mus_rg_encounter_girl, 0, 0 + song mus_rg_encounter_boy, 0, 0 + song mus_rg_hall_of_fame, 0, 0 + song mus_rg_viridian_forest, 0, 0 + song mus_rg_mt_moon, 0, 0 + song mus_rg_poke_mansion, 0, 0 + song mus_rg_credits, 0, 0 + song mus_rg_route1, 0, 0 + song mus_rg_route24, 0, 0 + song mus_rg_route3, 0, 0 + song mus_rg_route11, 0, 0 + song mus_rg_victory_road, 0, 0 + song mus_rg_vs_gym_leader, 0, 0 + song mus_rg_vs_trainer, 0, 0 + song mus_rg_vs_wild, 0, 0 + song mus_rg_vs_champion, 0, 0 + song mus_rg_pallet, 0, 0 + song mus_rg_oak_lab, 0, 0 + song mus_rg_oak, 0, 0 + song mus_rg_poke_center, 0, 0 + song mus_rg_ss_anne, 0, 0 + song mus_rg_surf, 0, 0 + song mus_rg_poke_tower, 0, 0 + song mus_rg_silph, 0, 0 + song mus_rg_fuchsia, 0, 0 + song mus_rg_celadon, 0, 0 + song mus_rg_victory_trainer, 0, 0 + song mus_rg_victory_wild, 0, 0 + song mus_rg_victory_gym_leader, 0, 0 + song mus_rg_vermillion, 0, 0 + song mus_rg_pewter, 0, 0 + song mus_rg_encounter_rival, 0, 0 + song mus_rg_rival_exit, 0, 0 + song mus_rg_dex_rating, 2, 2 + song mus_rg_obtain_key_item, 2, 2 + song mus_rg_caught_intro, 2, 2 + song mus_rg_photo, 2, 2 + song mus_rg_game_freak, 0, 0 + song mus_rg_caught, 0, 0 + song mus_rg_new_game_instruct, 0, 0 + song mus_rg_new_game_intro, 0, 0 + song mus_rg_new_game_exit, 0, 0 + song mus_rg_poke_jump, 0, 0 + song mus_rg_union_room, 0, 0 + song mus_rg_net_center, 0, 0 + song mus_rg_mystery_gift, 0, 0 + song mus_rg_berry_pick, 0, 0 + song mus_rg_sevii_cave, 0, 0 + song mus_rg_teachy_tv_show, 0, 0 + song mus_rg_sevii_route, 0, 0 + song mus_rg_sevii_dungeon, 0, 0 + song mus_rg_sevii_123, 0, 0 + song mus_rg_sevii_45, 0, 0 + song mus_rg_sevii_67, 0, 0 + song mus_rg_poke_flute, 2, 2 + song mus_rg_vs_deoxys, 0, 0 + song mus_rg_vs_mewtwo, 0, 0 + song mus_rg_vs_legend, 0, 0 + song mus_rg_encounter_gym_leader, 0, 0 + song mus_rg_encounter_deoxys, 0, 0 + song mus_rg_trainer_tower, 0, 0 + song mus_rg_slow_pallet, 0, 0 + song mus_rg_teachy_tv_menu, 0, 0 song ph_trap_blend, 2, 2 song ph_trap_held, 2, 2 song ph_trap_solo, 2, 2 diff --git a/sound/songs/midi/mus_dan02.mid b/sound/songs/midi/mus_abandoned_ship.mid similarity index 100% rename from sound/songs/midi/mus_dan02.mid rename to sound/songs/midi/mus_abandoned_ship.mid diff --git a/sound/songs/midi/mus_ooame.mid b/sound/songs/midi/mus_abnormal_weather.mid similarity index 100% rename from sound/songs/midi/mus_ooame.mid rename to sound/songs/midi/mus_abnormal_weather.mid diff --git a/sound/songs/midi/mus_ajito.mid b/sound/songs/midi/mus_aqua_magma_hideout.mid similarity index 100% rename from sound/songs/midi/mus_ajito.mid rename to sound/songs/midi/mus_aqua_magma_hideout.mid diff --git a/sound/songs/midi/mus_me_tama.mid b/sound/songs/midi/mus_awaken_legend.mid similarity index 100% rename from sound/songs/midi/mus_me_tama.mid rename to sound/songs/midi/mus_awaken_legend.mid diff --git a/sound/songs/midi/mus_b_dome1.mid b/sound/songs/midi/mus_b_dome_lobby.mid similarity index 100% rename from sound/songs/midi/mus_b_dome1.mid rename to sound/songs/midi/mus_b_dome_lobby.mid diff --git a/sound/songs/midi/mus_b_tube.mid b/sound/songs/midi/mus_b_pike.mid similarity index 100% rename from sound/songs/midi/mus_b_tube.mid rename to sound/songs/midi/mus_b_pike.mid diff --git a/sound/songs/midi/mus_pyramid.mid b/sound/songs/midi/mus_b_pyramid.mid similarity index 100% rename from sound/songs/midi/mus_pyramid.mid rename to sound/songs/midi/mus_b_pyramid.mid diff --git a/sound/songs/midi/mus_pyramid_top.mid b/sound/songs/midi/mus_b_pyramid_top.mid similarity index 100% rename from sound/songs/midi/mus_pyramid_top.mid rename to sound/songs/midi/mus_b_pyramid_top.mid diff --git a/sound/songs/midi/mus_b_tower.mid b/sound/songs/midi/mus_b_tower.mid index 8e0de89681..a8294614f2 100644 Binary files a/sound/songs/midi/mus_b_tower.mid and b/sound/songs/midi/mus_b_tower.mid differ diff --git a/sound/songs/midi/mus_b_tower_rs.mid b/sound/songs/midi/mus_b_tower_rs.mid new file mode 100644 index 0000000000..8e0de89681 Binary files /dev/null and b/sound/songs/midi/mus_b_tower_rs.mid differ diff --git a/sound/songs/midi/mus_odamaki.mid b/sound/songs/midi/mus_birch_lab.mid similarity index 100% rename from sound/songs/midi/mus_odamaki.mid rename to sound/songs/midi/mus_birch_lab.mid diff --git a/sound/songs/midi/mus_pcc.mid b/sound/songs/midi/mus_c_comm_center.mid similarity index 100% rename from sound/songs/midi/mus_pcc.mid rename to sound/songs/midi/mus_c_comm_center.mid diff --git a/sound/songs/midi/mus_suikun.mid b/sound/songs/midi/mus_c_vs_legend_beast.mid similarity index 100% rename from sound/songs/midi/mus_suikun.mid rename to sound/songs/midi/mus_c_vs_legend_beast.mid diff --git a/sound/songs/midi/mus_ropeway.mid b/sound/songs/midi/mus_cable_car.mid similarity index 100% rename from sound/songs/midi/mus_ropeway.mid rename to sound/songs/midi/mus_cable_car.mid diff --git a/sound/songs/midi/mus_kachi22.mid b/sound/songs/midi/mus_caught.mid similarity index 100% rename from sound/songs/midi/mus_kachi22.mid rename to sound/songs/midi/mus_caught.mid diff --git a/sound/songs/midi/mus_dan03.mid b/sound/songs/midi/mus_cave_of_origin.mid similarity index 100% rename from sound/songs/midi/mus_dan03.mid rename to sound/songs/midi/mus_cave_of_origin.mid diff --git a/sound/songs/midi/mus_contest0.mid b/sound/songs/midi/mus_contest.mid similarity index 100% rename from sound/songs/midi/mus_contest0.mid rename to sound/songs/midi/mus_contest.mid diff --git a/sound/songs/midi/mus_conlobby.mid b/sound/songs/midi/mus_contest_lobby.mid similarity index 100% rename from sound/songs/midi/mus_conlobby.mid rename to sound/songs/midi/mus_contest_lobby.mid diff --git a/sound/songs/midi/mus_con_k.mid b/sound/songs/midi/mus_contest_results.mid similarity index 100% rename from sound/songs/midi/mus_con_k.mid rename to sound/songs/midi/mus_contest_results.mid diff --git a/sound/songs/midi/mus_con_fan.mid b/sound/songs/midi/mus_contest_winner.mid similarity index 100% rename from sound/songs/midi/mus_con_fan.mid rename to sound/songs/midi/mus_contest_winner.mid diff --git a/sound/songs/midi/mus_thankfor.mid b/sound/songs/midi/mus_credits.mid similarity index 100% rename from sound/songs/midi/mus_thankfor.mid rename to sound/songs/midi/mus_credits.mid diff --git a/sound/songs/midi/mus_hightown.mid b/sound/songs/midi/mus_dewford.mid similarity index 100% rename from sound/songs/midi/mus_hightown.mid rename to sound/songs/midi/mus_dewford.mid diff --git a/sound/songs/midi/mus_aqa_0.mid b/sound/songs/midi/mus_encounter_aqua.mid similarity index 100% rename from sound/songs/midi/mus_aqa_0.mid rename to sound/songs/midi/mus_encounter_aqua.mid diff --git a/sound/songs/midi/mus_boy_sup.mid b/sound/songs/midi/mus_encounter_brendan.mid similarity index 100% rename from sound/songs/midi/mus_boy_sup.mid rename to sound/songs/midi/mus_encounter_brendan.mid diff --git a/sound/songs/midi/mus_daigo.mid b/sound/songs/midi/mus_encounter_champion.mid similarity index 100% rename from sound/songs/midi/mus_daigo.mid rename to sound/songs/midi/mus_encounter_champion.mid diff --git a/sound/songs/midi/mus_kakkoii.mid b/sound/songs/midi/mus_encounter_cool.mid similarity index 100% rename from sound/songs/midi/mus_kakkoii.mid rename to sound/songs/midi/mus_encounter_cool.mid diff --git a/sound/songs/midi/mus_sitennou.mid b/sound/songs/midi/mus_encounter_elite_four.mid similarity index 100% rename from sound/songs/midi/mus_sitennou.mid rename to sound/songs/midi/mus_encounter_elite_four.mid diff --git a/sound/songs/midi/mus_girleye.mid b/sound/songs/midi/mus_encounter_female.mid similarity index 100% rename from sound/songs/midi/mus_girleye.mid rename to sound/songs/midi/mus_encounter_female.mid diff --git a/sound/songs/midi/mus_syoujoeye.mid b/sound/songs/midi/mus_encounter_girl.mid similarity index 100% rename from sound/songs/midi/mus_syoujoeye.mid rename to sound/songs/midi/mus_encounter_girl.mid diff --git a/sound/songs/midi/mus_yama_eye.mid b/sound/songs/midi/mus_encounter_hiker.mid similarity index 100% rename from sound/songs/midi/mus_yama_eye.mid rename to sound/songs/midi/mus_encounter_hiker.mid diff --git a/sound/songs/midi/mus_hageshii.mid b/sound/songs/midi/mus_encounter_intense.mid similarity index 100% rename from sound/songs/midi/mus_hageshii.mid rename to sound/songs/midi/mus_encounter_intense.mid diff --git a/sound/songs/midi/mus_inter_v.mid b/sound/songs/midi/mus_encounter_interviewer.mid similarity index 100% rename from sound/songs/midi/mus_inter_v.mid rename to sound/songs/midi/mus_encounter_interviewer.mid diff --git a/sound/songs/midi/mus_mgm0.mid b/sound/songs/midi/mus_encounter_magma.mid similarity index 100% rename from sound/songs/midi/mus_mgm0.mid rename to sound/songs/midi/mus_encounter_magma.mid diff --git a/sound/songs/midi/mus_boyeye.mid b/sound/songs/midi/mus_encounter_male.mid similarity index 100% rename from sound/songs/midi/mus_boyeye.mid rename to sound/songs/midi/mus_encounter_male.mid diff --git a/sound/songs/midi/mus_girl_sup.mid b/sound/songs/midi/mus_encounter_may.mid similarity index 100% rename from sound/songs/midi/mus_girl_sup.mid rename to sound/songs/midi/mus_encounter_may.mid diff --git a/sound/songs/midi/mus_test.mid b/sound/songs/midi/mus_encounter_rich.mid similarity index 100% rename from sound/songs/midi/mus_test.mid rename to sound/songs/midi/mus_encounter_rich.mid diff --git a/sound/songs/midi/mus_ayasii.mid b/sound/songs/midi/mus_encounter_suspicious.mid similarity index 100% rename from sound/songs/midi/mus_ayasii.mid rename to sound/songs/midi/mus_encounter_suspicious.mid diff --git a/sound/songs/midi/mus_swimeye.mid b/sound/songs/midi/mus_encounter_swimmer.mid similarity index 100% rename from sound/songs/midi/mus_swimeye.mid rename to sound/songs/midi/mus_encounter_swimmer.mid diff --git a/sound/songs/midi/mus_hutago.mid b/sound/songs/midi/mus_encounter_twins.mid similarity index 100% rename from sound/songs/midi/mus_hutago.mid rename to sound/songs/midi/mus_encounter_twins.mid diff --git a/sound/songs/midi/mus_rainbow.mid b/sound/songs/midi/mus_ever_grande.mid similarity index 100% rename from sound/songs/midi/mus_rainbow.mid rename to sound/songs/midi/mus_ever_grande.mid diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_evolution.mid similarity index 100% rename from sound/songs/midi/mus_shinka.mid rename to sound/songs/midi/mus_evolution.mid diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_evolution_intro.mid similarity index 100% rename from sound/songs/midi/mus_me_shinka.mid rename to sound/songs/midi/mus_evolution_intro.mid diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_evolved.mid similarity index 100% rename from sound/songs/midi/mus_fanfa5.mid rename to sound/songs/midi/mus_evolved.mid diff --git a/sound/songs/midi/mus_tonekusa.mid b/sound/songs/midi/mus_fallarbor.mid similarity index 100% rename from sound/songs/midi/mus_tonekusa.mid rename to sound/songs/midi/mus_fallarbor.mid diff --git a/sound/songs/midi/mus_tsuretek.mid b/sound/songs/midi/mus_follow_me.mid similarity index 100% rename from sound/songs/midi/mus_tsuretek.mid rename to sound/songs/midi/mus_follow_me.mid diff --git a/sound/songs/midi/mus_machi_s3.mid b/sound/songs/midi/mus_fortree.mid similarity index 100% rename from sound/songs/midi/mus_machi_s3.mid rename to sound/songs/midi/mus_fortree.mid diff --git a/sound/songs/midi/mus_casino.mid b/sound/songs/midi/mus_game_corner.mid similarity index 100% rename from sound/songs/midi/mus_casino.mid rename to sound/songs/midi/mus_game_corner.mid diff --git a/sound/songs/midi/mus_nibi.mid b/sound/songs/midi/mus_gsc_pewter.mid similarity index 100% rename from sound/songs/midi/mus_nibi.mid rename to sound/songs/midi/mus_gsc_pewter.mid diff --git a/sound/songs/midi/mus_field13.mid b/sound/songs/midi/mus_gsc_route38.mid similarity index 100% rename from sound/songs/midi/mus_field13.mid rename to sound/songs/midi/mus_gsc_route38.mid diff --git a/sound/songs/midi/mus_gim.mid b/sound/songs/midi/mus_gym.mid similarity index 100% rename from sound/songs/midi/mus_gim.mid rename to sound/songs/midi/mus_gym.mid diff --git a/sound/songs/midi/mus_dendou.mid b/sound/songs/midi/mus_hall_of_fame.mid similarity index 100% rename from sound/songs/midi/mus_dendou.mid rename to sound/songs/midi/mus_hall_of_fame.mid diff --git a/sound/songs/midi/mus_eikou_r.mid b/sound/songs/midi/mus_hall_of_fame_room.mid similarity index 100% rename from sound/songs/midi/mus_eikou_r.mid rename to sound/songs/midi/mus_hall_of_fame_room.mid diff --git a/sound/songs/midi/mus_me_asa.mid b/sound/songs/midi/mus_heal.mid similarity index 100% rename from sound/songs/midi/mus_me_asa.mid rename to sound/songs/midi/mus_heal.mid diff --git a/sound/songs/midi/mus_event0.mid b/sound/songs/midi/mus_help.mid similarity index 100% rename from sound/songs/midi/mus_event0.mid rename to sound/songs/midi/mus_help.mid diff --git a/sound/songs/midi/mus_demo1.mid b/sound/songs/midi/mus_intro.mid similarity index 100% rename from sound/songs/midi/mus_demo1.mid rename to sound/songs/midi/mus_intro.mid diff --git a/sound/songs/midi/mus_t_battle.mid b/sound/songs/midi/mus_intro_battle.mid similarity index 100% rename from sound/songs/midi/mus_t_battle.mid rename to sound/songs/midi/mus_intro_battle.mid diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_level_up.mid similarity index 100% rename from sound/songs/midi/mus_fanfa1.mid rename to sound/songs/midi/mus_level_up.mid diff --git a/sound/songs/midi/mus_minamo.mid b/sound/songs/midi/mus_lilycove.mid similarity index 100% rename from sound/songs/midi/mus_minamo.mid rename to sound/songs/midi/mus_lilycove.mid diff --git a/sound/songs/midi/mus_bijyutu.mid b/sound/songs/midi/mus_lilycove_museum.mid similarity index 100% rename from sound/songs/midi/mus_bijyutu.mid rename to sound/songs/midi/mus_lilycove_museum.mid diff --git a/sound/songs/midi/mus_test1.mid b/sound/songs/midi/mus_link_contest_p1.mid similarity index 100% rename from sound/songs/midi/mus_test1.mid rename to sound/songs/midi/mus_link_contest_p1.mid diff --git a/sound/songs/midi/mus_test2.mid b/sound/songs/midi/mus_link_contest_p2.mid similarity index 100% rename from sound/songs/midi/mus_test2.mid rename to sound/songs/midi/mus_link_contest_p2.mid diff --git a/sound/songs/midi/mus_test3.mid b/sound/songs/midi/mus_link_contest_p3.mid similarity index 100% rename from sound/songs/midi/mus_test3.mid rename to sound/songs/midi/mus_link_contest_p3.mid diff --git a/sound/songs/midi/mus_test4.mid b/sound/songs/midi/mus_link_contest_p4.mid similarity index 100% rename from sound/songs/midi/mus_test4.mid rename to sound/songs/midi/mus_link_contest_p4.mid diff --git a/sound/songs/midi/mus_mishiro.mid b/sound/songs/midi/mus_littleroot.mid similarity index 100% rename from sound/songs/midi/mus_mishiro.mid rename to sound/songs/midi/mus_littleroot.mid diff --git a/sound/songs/midi/mus_tetsuji.mid b/sound/songs/midi/mus_littleroot_test.mid similarity index 100% rename from sound/songs/midi/mus_tetsuji.mid rename to sound/songs/midi/mus_littleroot_test.mid diff --git a/sound/songs/midi/mus_me_wasure.mid b/sound/songs/midi/mus_move_deleted.mid similarity index 100% rename from sound/songs/midi/mus_me_wasure.mid rename to sound/songs/midi/mus_move_deleted.mid diff --git a/sound/songs/midi/mus_tozan.mid b/sound/songs/midi/mus_mt_chimney.mid similarity index 100% rename from sound/songs/midi/mus_tozan.mid rename to sound/songs/midi/mus_mt_chimney.mid diff --git a/sound/songs/midi/mus_m_dungon.mid b/sound/songs/midi/mus_mt_pyre.mid similarity index 100% rename from sound/songs/midi/mus_m_dungon.mid rename to sound/songs/midi/mus_mt_pyre.mid diff --git a/sound/songs/midi/mus_machupi.mid b/sound/songs/midi/mus_mt_pyre_exterior.mid similarity index 100% rename from sound/songs/midi/mus_machupi.mid rename to sound/songs/midi/mus_mt_pyre_exterior.mid diff --git a/sound/songs/midi/mus_me_pointget.mid b/sound/songs/midi/mus_obtain_b_points.mid similarity index 100% rename from sound/songs/midi/mus_me_pointget.mid rename to sound/songs/midi/mus_obtain_b_points.mid diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_obtain_badge.mid similarity index 100% rename from sound/songs/midi/mus_me_bachi.mid rename to sound/songs/midi/mus_obtain_badge.mid diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_obtain_berry.mid similarity index 100% rename from sound/songs/midi/mus_me_kinomi.mid rename to sound/songs/midi/mus_obtain_berry.mid diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_obtain_item.mid similarity index 100% rename from sound/songs/midi/mus_fanfa4.mid rename to sound/songs/midi/mus_obtain_item.mid diff --git a/sound/songs/midi/mus_me_symbolget.mid b/sound/songs/midi/mus_obtain_symbol.mid similarity index 100% rename from sound/songs/midi/mus_me_symbolget.mid rename to sound/songs/midi/mus_obtain_symbol.mid diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_obtain_tmhm.mid similarity index 100% rename from sound/songs/midi/mus_me_waza.mid rename to sound/songs/midi/mus_obtain_tmhm.mid diff --git a/sound/songs/midi/mus_fune_kan.mid b/sound/songs/midi/mus_oceanic_museum.mid similarity index 100% rename from sound/songs/midi/mus_fune_kan.mid rename to sound/songs/midi/mus_oceanic_museum.mid diff --git a/sound/songs/midi/mus_machi_s4.mid b/sound/songs/midi/mus_oldale.mid similarity index 100% rename from sound/songs/midi/mus_machi_s4.mid rename to sound/songs/midi/mus_oldale.mid diff --git a/sound/songs/midi/mus_machi_s2.mid b/sound/songs/midi/mus_petalburg.mid similarity index 100% rename from sound/songs/midi/mus_machi_s2.mid rename to sound/songs/midi/mus_petalburg.mid diff --git a/sound/songs/midi/mus_dan01.mid b/sound/songs/midi/mus_petalburg_woods.mid similarity index 100% rename from sound/songs/midi/mus_dan01.mid rename to sound/songs/midi/mus_petalburg_woods.mid diff --git a/sound/songs/midi/mus_pokecen.mid b/sound/songs/midi/mus_poke_center.mid similarity index 100% rename from sound/songs/midi/mus_pokecen.mid rename to sound/songs/midi/mus_poke_center.mid diff --git a/sound/songs/midi/mus_friendly.mid b/sound/songs/midi/mus_poke_mart.mid similarity index 100% rename from sound/songs/midi/mus_friendly.mid rename to sound/songs/midi/mus_poke_mart.mid diff --git a/sound/songs/midi/mus_rekkuu_kourin.mid b/sound/songs/midi/mus_rayquaza_appears.mid similarity index 100% rename from sound/songs/midi/mus_rekkuu_kourin.mid rename to sound/songs/midi/mus_rayquaza_appears.mid diff --git a/sound/songs/midi/mus_me_tore_eye.mid b/sound/songs/midi/mus_register_match_call.mid similarity index 100% rename from sound/songs/midi/mus_me_tore_eye.mid rename to sound/songs/midi/mus_register_match_call.mid diff --git a/sound/songs/midi/mus_rg_kinomikui.mid b/sound/songs/midi/mus_rg_berry_pick.mid similarity index 100% rename from sound/songs/midi/mus_rg_kinomikui.mid rename to sound/songs/midi/mus_rg_berry_pick.mid diff --git a/sound/songs/midi/mus_rg_get_yasei.mid b/sound/songs/midi/mus_rg_caught.mid similarity index 100% rename from sound/songs/midi/mus_rg_get_yasei.mid rename to sound/songs/midi/mus_rg_caught.mid diff --git a/sound/songs/midi/mus_rg_fan6.mid b/sound/songs/midi/mus_rg_caught_intro.mid similarity index 100% rename from sound/songs/midi/mus_rg_fan6.mid rename to sound/songs/midi/mus_rg_caught_intro.mid diff --git a/sound/songs/midi/mus_rg_tamamusi.mid b/sound/songs/midi/mus_rg_celadon.mid similarity index 100% rename from sound/songs/midi/mus_rg_tamamusi.mid rename to sound/songs/midi/mus_rg_celadon.mid diff --git a/sound/songs/midi/mus_rg_guren.mid b/sound/songs/midi/mus_rg_cinnabar.mid similarity index 100% rename from sound/songs/midi/mus_rg_guren.mid rename to sound/songs/midi/mus_rg_cinnabar.mid diff --git a/sound/songs/midi/mus_rg_ending.mid b/sound/songs/midi/mus_rg_credits.mid similarity index 100% rename from sound/songs/midi/mus_rg_ending.mid rename to sound/songs/midi/mus_rg_credits.mid diff --git a/sound/songs/midi/mus_rg_fan2.mid b/sound/songs/midi/mus_rg_dex_rating.mid similarity index 100% rename from sound/songs/midi/mus_rg_fan2.mid rename to sound/songs/midi/mus_rg_dex_rating.mid diff --git a/sound/songs/midi/mus_rg_shounen.mid b/sound/songs/midi/mus_rg_encounter_boy.mid similarity index 100% rename from sound/songs/midi/mus_rg_shounen.mid rename to sound/songs/midi/mus_rg_encounter_boy.mid diff --git a/sound/songs/midi/mus_rg_deoeye.mid b/sound/songs/midi/mus_rg_encounter_deoxys.mid similarity index 100% rename from sound/songs/midi/mus_rg_deoeye.mid rename to sound/songs/midi/mus_rg_encounter_deoxys.mid diff --git a/sound/songs/midi/mus_rg_shoujo.mid b/sound/songs/midi/mus_rg_encounter_girl.mid similarity index 100% rename from sound/songs/midi/mus_rg_shoujo.mid rename to sound/songs/midi/mus_rg_encounter_girl.mid diff --git a/sound/songs/midi/mus_rg_exeye.mid b/sound/songs/midi/mus_rg_encounter_gym_leader.mid similarity index 100% rename from sound/songs/midi/mus_rg_exeye.mid rename to sound/songs/midi/mus_rg_encounter_gym_leader.mid diff --git a/sound/songs/midi/mus_rg_rival1.mid b/sound/songs/midi/mus_rg_encounter_rival.mid similarity index 100% rename from sound/songs/midi/mus_rg_rival1.mid rename to sound/songs/midi/mus_rg_encounter_rival.mid diff --git a/sound/songs/midi/mus_rg_rocket.mid b/sound/songs/midi/mus_rg_encounter_rocket.mid similarity index 100% rename from sound/songs/midi/mus_rg_rocket.mid rename to sound/songs/midi/mus_rg_encounter_rocket.mid diff --git a/sound/songs/midi/mus_rg_annai.mid b/sound/songs/midi/mus_rg_follow_me.mid similarity index 100% rename from sound/songs/midi/mus_rg_annai.mid rename to sound/songs/midi/mus_rg_follow_me.mid diff --git a/sound/songs/midi/mus_rg_hanada.mid b/sound/songs/midi/mus_rg_fuchsia.mid similarity index 100% rename from sound/songs/midi/mus_rg_hanada.mid rename to sound/songs/midi/mus_rg_fuchsia.mid diff --git a/sound/songs/midi/mus_rg_slot.mid b/sound/songs/midi/mus_rg_game_corner.mid similarity index 100% rename from sound/songs/midi/mus_rg_slot.mid rename to sound/songs/midi/mus_rg_game_corner.mid diff --git a/sound/songs/midi/mus_rg_titlerog.mid b/sound/songs/midi/mus_rg_game_freak.mid similarity index 100% rename from sound/songs/midi/mus_rg_titlerog.mid rename to sound/songs/midi/mus_rg_game_freak.mid diff --git a/sound/songs/midi/mus_rg_dendou.mid b/sound/songs/midi/mus_rg_hall_of_fame.mid similarity index 100% rename from sound/songs/midi/mus_rg_dendou.mid rename to sound/songs/midi/mus_rg_hall_of_fame.mid diff --git a/sound/songs/midi/mus_rg_kaihuku.mid b/sound/songs/midi/mus_rg_heal.mid similarity index 100% rename from sound/songs/midi/mus_rg_kaihuku.mid rename to sound/songs/midi/mus_rg_heal.mid diff --git a/sound/songs/midi/mus_rg_demo.mid b/sound/songs/midi/mus_rg_intro_fight.mid similarity index 100% rename from sound/songs/midi/mus_rg_demo.mid rename to sound/songs/midi/mus_rg_intro_fight.mid diff --git a/sound/songs/midi/mus_rg_purin.mid b/sound/songs/midi/mus_rg_jigglypuff.mid similarity index 100% rename from sound/songs/midi/mus_rg_purin.mid rename to sound/songs/midi/mus_rg_jigglypuff.mid diff --git a/sound/songs/midi/mus_rg_shion.mid b/sound/songs/midi/mus_rg_lavender.mid similarity index 100% rename from sound/songs/midi/mus_rg_shion.mid rename to sound/songs/midi/mus_rg_lavender.mid diff --git a/sound/songs/midi/mus_rg_otsukimi.mid b/sound/songs/midi/mus_rg_mt_moon.mid similarity index 100% rename from sound/songs/midi/mus_rg_otsukimi.mid rename to sound/songs/midi/mus_rg_mt_moon.mid diff --git a/sound/songs/midi/mus_rg_okurimono.mid b/sound/songs/midi/mus_rg_mystery_gift.mid similarity index 100% rename from sound/songs/midi/mus_rg_okurimono.mid rename to sound/songs/midi/mus_rg_mystery_gift.mid diff --git a/sound/songs/midi/mus_rg_network.mid b/sound/songs/midi/mus_rg_net_center.mid similarity index 100% rename from sound/songs/midi/mus_rg_network.mid rename to sound/songs/midi/mus_rg_net_center.mid diff --git a/sound/songs/midi/mus_rg_seibetu.mid b/sound/songs/midi/mus_rg_new_game_exit.mid similarity index 100% rename from sound/songs/midi/mus_rg_seibetu.mid rename to sound/songs/midi/mus_rg_new_game_exit.mid diff --git a/sound/songs/midi/mus_rg_sousa.mid b/sound/songs/midi/mus_rg_new_game_instruct.mid similarity index 100% rename from sound/songs/midi/mus_rg_sousa.mid rename to sound/songs/midi/mus_rg_new_game_instruct.mid diff --git a/sound/songs/midi/mus_rg_sekaikan.mid b/sound/songs/midi/mus_rg_new_game_intro.mid similarity index 100% rename from sound/songs/midi/mus_rg_sekaikan.mid rename to sound/songs/midi/mus_rg_new_game_intro.mid diff --git a/sound/songs/midi/mus_rg_ohkido.mid b/sound/songs/midi/mus_rg_oak.mid similarity index 100% rename from sound/songs/midi/mus_rg_ohkido.mid rename to sound/songs/midi/mus_rg_oak.mid diff --git a/sound/songs/midi/mus_rg_kenkyu.mid b/sound/songs/midi/mus_rg_oak_lab.mid similarity index 100% rename from sound/songs/midi/mus_rg_kenkyu.mid rename to sound/songs/midi/mus_rg_oak_lab.mid diff --git a/sound/songs/midi/mus_rg_fan5.mid b/sound/songs/midi/mus_rg_obtain_key_item.mid similarity index 100% rename from sound/songs/midi/mus_rg_fan5.mid rename to sound/songs/midi/mus_rg_obtain_key_item.mid diff --git a/sound/songs/midi/mus_rg_masara.mid b/sound/songs/midi/mus_rg_pallet.mid similarity index 100% rename from sound/songs/midi/mus_rg_masara.mid rename to sound/songs/midi/mus_rg_pallet.mid diff --git a/sound/songs/midi/mus_rg_nana123.mid b/sound/songs/midi/mus_rg_pewter.mid similarity index 100% rename from sound/songs/midi/mus_rg_nana123.mid rename to sound/songs/midi/mus_rg_pewter.mid diff --git a/sound/songs/midi/mus_me_rg_photo.mid b/sound/songs/midi/mus_rg_photo.mid similarity index 100% rename from sound/songs/midi/mus_me_rg_photo.mid rename to sound/songs/midi/mus_rg_photo.mid diff --git a/sound/songs/midi/mus_rg_pokecen.mid b/sound/songs/midi/mus_rg_poke_center.mid similarity index 100% rename from sound/songs/midi/mus_rg_pokecen.mid rename to sound/songs/midi/mus_rg_poke_center.mid diff --git a/sound/songs/midi/mus_rg_pokefue.mid b/sound/songs/midi/mus_rg_poke_flute.mid similarity index 100% rename from sound/songs/midi/mus_rg_pokefue.mid rename to sound/songs/midi/mus_rg_poke_flute.mid diff --git a/sound/songs/midi/mus_rg_jump.mid b/sound/songs/midi/mus_rg_poke_jump.mid similarity index 100% rename from sound/songs/midi/mus_rg_jump.mid rename to sound/songs/midi/mus_rg_poke_jump.mid diff --git a/sound/songs/midi/mus_rg_pokeyashi.mid b/sound/songs/midi/mus_rg_poke_mansion.mid similarity index 100% rename from sound/songs/midi/mus_rg_pokeyashi.mid rename to sound/songs/midi/mus_rg_poke_mansion.mid diff --git a/sound/songs/midi/mus_rg_p_tower.mid b/sound/songs/midi/mus_rg_poke_tower.mid similarity index 100% rename from sound/songs/midi/mus_rg_p_tower.mid rename to sound/songs/midi/mus_rg_poke_tower.mid diff --git a/sound/songs/midi/mus_rg_rival2.mid b/sound/songs/midi/mus_rg_rival_exit.mid similarity index 100% rename from sound/songs/midi/mus_rg_rival2.mid rename to sound/songs/midi/mus_rg_rival_exit.mid diff --git a/sound/songs/midi/mus_rg_ajito.mid b/sound/songs/midi/mus_rg_rocket_hideout.mid similarity index 100% rename from sound/songs/midi/mus_rg_ajito.mid rename to sound/songs/midi/mus_rg_rocket_hideout.mid diff --git a/sound/songs/midi/mus_rg_load01.mid b/sound/songs/midi/mus_rg_route1.mid similarity index 100% rename from sound/songs/midi/mus_rg_load01.mid rename to sound/songs/midi/mus_rg_route1.mid diff --git a/sound/songs/midi/mus_rg_load03.mid b/sound/songs/midi/mus_rg_route11.mid similarity index 100% rename from sound/songs/midi/mus_rg_load03.mid rename to sound/songs/midi/mus_rg_route11.mid diff --git a/sound/songs/midi/mus_rg_opening.mid b/sound/songs/midi/mus_rg_route24.mid similarity index 100% rename from sound/songs/midi/mus_rg_opening.mid rename to sound/songs/midi/mus_rg_route24.mid diff --git a/sound/songs/midi/mus_rg_load02.mid b/sound/songs/midi/mus_rg_route3.mid similarity index 100% rename from sound/songs/midi/mus_rg_load02.mid rename to sound/songs/midi/mus_rg_route3.mid diff --git a/sound/songs/midi/mus_rg_nibi.mid b/sound/songs/midi/mus_rg_sevii_123.mid similarity index 100% rename from sound/songs/midi/mus_rg_nibi.mid rename to sound/songs/midi/mus_rg_sevii_123.mid diff --git a/sound/songs/midi/mus_rg_nana45.mid b/sound/songs/midi/mus_rg_sevii_45.mid similarity index 100% rename from sound/songs/midi/mus_rg_nana45.mid rename to sound/songs/midi/mus_rg_sevii_45.mid diff --git a/sound/songs/midi/mus_rg_nana67.mid b/sound/songs/midi/mus_rg_sevii_67.mid similarity index 100% rename from sound/songs/midi/mus_rg_nana67.mid rename to sound/songs/midi/mus_rg_sevii_67.mid diff --git a/sound/songs/midi/mus_rg_nanadungeon.mid b/sound/songs/midi/mus_rg_sevii_cave.mid similarity index 100% rename from sound/songs/midi/mus_rg_nanadungeon.mid rename to sound/songs/midi/mus_rg_sevii_cave.mid diff --git a/sound/songs/midi/mus_rg_nanaiseki.mid b/sound/songs/midi/mus_rg_sevii_dungeon.mid similarity index 100% rename from sound/songs/midi/mus_rg_nanaiseki.mid rename to sound/songs/midi/mus_rg_sevii_dungeon.mid diff --git a/sound/songs/midi/mus_rg_nanashima.mid b/sound/songs/midi/mus_rg_sevii_route.mid similarity index 100% rename from sound/songs/midi/mus_rg_nanashima.mid rename to sound/songs/midi/mus_rg_sevii_route.mid diff --git a/sound/songs/midi/mus_rg_shiruhu.mid b/sound/songs/midi/mus_rg_silph.mid similarity index 100% rename from sound/songs/midi/mus_rg_shiruhu.mid rename to sound/songs/midi/mus_rg_silph.mid diff --git a/sound/songs/midi/mus_rg_slowmasara.mid b/sound/songs/midi/mus_rg_slow_pallet.mid similarity index 100% rename from sound/songs/midi/mus_rg_slowmasara.mid rename to sound/songs/midi/mus_rg_slow_pallet.mid diff --git a/sound/songs/midi/mus_rg_santoan.mid b/sound/songs/midi/mus_rg_ss_anne.mid similarity index 100% rename from sound/songs/midi/mus_rg_santoan.mid rename to sound/songs/midi/mus_rg_ss_anne.mid diff --git a/sound/songs/midi/mus_rg_naminori.mid b/sound/songs/midi/mus_rg_surf.mid similarity index 100% rename from sound/songs/midi/mus_rg_naminori.mid rename to sound/songs/midi/mus_rg_surf.mid diff --git a/sound/songs/midi/mus_rg_tvnoize.mid b/sound/songs/midi/mus_rg_teachy_tv_menu.mid similarity index 100% rename from sound/songs/midi/mus_rg_tvnoize.mid rename to sound/songs/midi/mus_rg_teachy_tv_menu.mid diff --git a/sound/songs/midi/mus_rg_oshie_tv.mid b/sound/songs/midi/mus_rg_teachy_tv_show.mid similarity index 100% rename from sound/songs/midi/mus_rg_oshie_tv.mid rename to sound/songs/midi/mus_rg_teachy_tv_show.mid diff --git a/sound/songs/midi/mus_rg_t_tower.mid b/sound/songs/midi/mus_rg_trainer_tower.mid similarity index 100% rename from sound/songs/midi/mus_rg_t_tower.mid rename to sound/songs/midi/mus_rg_trainer_tower.mid diff --git a/sound/songs/midi/mus_rg_union.mid b/sound/songs/midi/mus_rg_union_room.mid similarity index 100% rename from sound/songs/midi/mus_rg_union.mid rename to sound/songs/midi/mus_rg_union_room.mid diff --git a/sound/songs/midi/mus_rg_kuchiba.mid b/sound/songs/midi/mus_rg_vermillion.mid similarity index 100% rename from sound/songs/midi/mus_rg_kuchiba.mid rename to sound/songs/midi/mus_rg_vermillion.mid diff --git a/sound/songs/midi/mus_kachi3.mid b/sound/songs/midi/mus_rg_victory_gym_leader.mid similarity index 100% rename from sound/songs/midi/mus_kachi3.mid rename to sound/songs/midi/mus_rg_victory_gym_leader.mid diff --git a/sound/songs/midi/mus_rg_champ_r.mid b/sound/songs/midi/mus_rg_victory_road.mid similarity index 100% rename from sound/songs/midi/mus_rg_champ_r.mid rename to sound/songs/midi/mus_rg_victory_road.mid diff --git a/sound/songs/midi/mus_rg_win_tre.mid b/sound/songs/midi/mus_rg_victory_trainer.mid similarity index 100% rename from sound/songs/midi/mus_rg_win_tre.mid rename to sound/songs/midi/mus_rg_victory_trainer.mid diff --git a/sound/songs/midi/mus_kachi2.mid b/sound/songs/midi/mus_rg_victory_wild.mid similarity index 100% rename from sound/songs/midi/mus_kachi2.mid rename to sound/songs/midi/mus_rg_victory_wild.mid diff --git a/sound/songs/midi/mus_rg_t_mori.mid b/sound/songs/midi/mus_rg_viridian_forest.mid similarity index 100% rename from sound/songs/midi/mus_rg_t_mori.mid rename to sound/songs/midi/mus_rg_viridian_forest.mid diff --git a/sound/songs/midi/mus_rg_vs_last.mid b/sound/songs/midi/mus_rg_vs_champion.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_last.mid rename to sound/songs/midi/mus_rg_vs_champion.mid diff --git a/sound/songs/midi/mus_rg_vs_deo.mid b/sound/songs/midi/mus_rg_vs_deoxys.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_deo.mid rename to sound/songs/midi/mus_rg_vs_deoxys.mid diff --git a/sound/songs/midi/mus_rg_vs_gym.mid b/sound/songs/midi/mus_rg_vs_gym_leader.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_gym.mid rename to sound/songs/midi/mus_rg_vs_gym_leader.mid diff --git a/sound/songs/midi/mus_rg_vs_den.mid b/sound/songs/midi/mus_rg_vs_legend.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_den.mid rename to sound/songs/midi/mus_rg_vs_legend.mid diff --git a/sound/songs/midi/mus_rg_vs_myu2.mid b/sound/songs/midi/mus_rg_vs_mewtwo.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_myu2.mid rename to sound/songs/midi/mus_rg_vs_mewtwo.mid diff --git a/sound/songs/midi/mus_rg_vs_tore.mid b/sound/songs/midi/mus_rg_vs_trainer.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_tore.mid rename to sound/songs/midi/mus_rg_vs_trainer.mid diff --git a/sound/songs/midi/mus_rg_vs_yasei.mid b/sound/songs/midi/mus_rg_vs_wild.mid similarity index 100% rename from sound/songs/midi/mus_rg_vs_yasei.mid rename to sound/songs/midi/mus_rg_vs_wild.mid diff --git a/sound/songs/midi/mus_bd_time.mid b/sound/songs/midi/mus_roulette.mid similarity index 100% rename from sound/songs/midi/mus_bd_time.mid rename to sound/songs/midi/mus_roulette.mid diff --git a/sound/songs/midi/mus_dooro1.mid b/sound/songs/midi/mus_route101.mid similarity index 100% rename from sound/songs/midi/mus_dooro1.mid rename to sound/songs/midi/mus_route101.mid diff --git a/sound/songs/midi/mus_nextroad.mid b/sound/songs/midi/mus_route104.mid similarity index 100% rename from sound/songs/midi/mus_nextroad.mid rename to sound/songs/midi/mus_route104.mid diff --git a/sound/songs/midi/mus_dooro_x1.mid b/sound/songs/midi/mus_route110.mid similarity index 100% rename from sound/songs/midi/mus_dooro_x1.mid rename to sound/songs/midi/mus_route110.mid diff --git a/sound/songs/midi/mus_ashroad.mid b/sound/songs/midi/mus_route111.mid similarity index 100% rename from sound/songs/midi/mus_ashroad.mid rename to sound/songs/midi/mus_route111.mid diff --git a/sound/songs/midi/mus_kazanbai.mid b/sound/songs/midi/mus_route113.mid similarity index 100% rename from sound/songs/midi/mus_kazanbai.mid rename to sound/songs/midi/mus_route113.mid diff --git a/sound/songs/midi/mus_granroad.mid b/sound/songs/midi/mus_route119.mid similarity index 100% rename from sound/songs/midi/mus_granroad.mid rename to sound/songs/midi/mus_route119.mid diff --git a/sound/songs/midi/mus_dooro_x3.mid b/sound/songs/midi/mus_route120.mid similarity index 100% rename from sound/songs/midi/mus_dooro_x3.mid rename to sound/songs/midi/mus_route120.mid diff --git a/sound/songs/midi/mus_dooro_x4.mid b/sound/songs/midi/mus_route122.mid similarity index 100% rename from sound/songs/midi/mus_dooro_x4.mid rename to sound/songs/midi/mus_route122.mid diff --git a/sound/songs/midi/mus_gotown.mid b/sound/songs/midi/mus_rustboro.mid similarity index 100% rename from sound/songs/midi/mus_gotown.mid rename to sound/songs/midi/mus_rustboro.mid diff --git a/sound/songs/midi/mus_safari.mid b/sound/songs/midi/mus_safari_zone.mid similarity index 100% rename from sound/songs/midi/mus_safari.mid rename to sound/songs/midi/mus_safari_zone.mid diff --git a/sound/songs/midi/mus_m_boat.mid b/sound/songs/midi/mus_sailing.mid similarity index 100% rename from sound/songs/midi/mus_m_boat.mid rename to sound/songs/midi/mus_sailing.mid diff --git a/sound/songs/midi/mus_sattower.mid b/sound/songs/midi/mus_sattower.mid deleted file mode 100644 index a8294614f2..0000000000 Binary files a/sound/songs/midi/mus_sattower.mid and /dev/null differ diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_school.mid similarity index 100% rename from sound/songs/midi/mus_p_school.mid rename to sound/songs/midi/mus_school.mid diff --git a/sound/songs/midi/mus_maborosi.mid b/sound/songs/midi/mus_sealed_chamber.mid similarity index 100% rename from sound/songs/midi/mus_maborosi.mid rename to sound/songs/midi/mus_sealed_chamber.mid diff --git a/sound/songs/midi/mus_finecity.mid b/sound/songs/midi/mus_slateport.mid similarity index 100% rename from sound/songs/midi/mus_finecity.mid rename to sound/songs/midi/mus_slateport.mid diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_slots_jackpot.mid similarity index 100% rename from sound/songs/midi/mus_me_b_big.mid rename to sound/songs/midi/mus_slots_jackpot.mid diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_slots_win.mid similarity index 100% rename from sound/songs/midi/mus_me_b_small.mid rename to sound/songs/midi/mus_slots_win.mid diff --git a/sound/songs/midi/mus_runecity.mid b/sound/songs/midi/mus_sootopolis.mid similarity index 100% rename from sound/songs/midi/mus_runecity.mid rename to sound/songs/midi/mus_sootopolis.mid diff --git a/sound/songs/midi/mus_naminori.mid b/sound/songs/midi/mus_surf.mid similarity index 100% rename from sound/songs/midi/mus_naminori.mid rename to sound/songs/midi/mus_surf.mid diff --git a/sound/songs/midi/mus_title3.mid b/sound/songs/midi/mus_title.mid similarity index 100% rename from sound/songs/midi/mus_title3.mid rename to sound/songs/midi/mus_title.mid diff --git a/sound/songs/midi/mus_me_zannen.mid b/sound/songs/midi/mus_too_bad.mid similarity index 100% rename from sound/songs/midi/mus_me_zannen.mid rename to sound/songs/midi/mus_too_bad.mid diff --git a/sound/songs/midi/mus_karakuri.mid b/sound/songs/midi/mus_trick_house.mid similarity index 100% rename from sound/songs/midi/mus_karakuri.mid rename to sound/songs/midi/mus_trick_house.mid diff --git a/sound/songs/midi/mus_deepdeep.mid b/sound/songs/midi/mus_underwater.mid similarity index 100% rename from sound/songs/midi/mus_deepdeep.mid rename to sound/songs/midi/mus_underwater.mid diff --git a/sound/songs/midi/mus_gomachi0.mid b/sound/songs/midi/mus_verdanturf.mid similarity index 100% rename from sound/songs/midi/mus_gomachi0.mid rename to sound/songs/midi/mus_verdanturf.mid diff --git a/sound/songs/midi/mus_kachi4.mid b/sound/songs/midi/mus_victory_aqua_magma.mid similarity index 100% rename from sound/songs/midi/mus_kachi4.mid rename to sound/songs/midi/mus_victory_aqua_magma.mid diff --git a/sound/songs/midi/mus_rg_win_gym.mid b/sound/songs/midi/mus_victory_gym_leader.mid similarity index 100% rename from sound/songs/midi/mus_rg_win_gym.mid rename to sound/songs/midi/mus_victory_gym_leader.mid diff --git a/sound/songs/midi/mus_kachi5.mid b/sound/songs/midi/mus_victory_league.mid similarity index 100% rename from sound/songs/midi/mus_kachi5.mid rename to sound/songs/midi/mus_victory_league.mid diff --git a/sound/songs/midi/mus_c_road.mid b/sound/songs/midi/mus_victory_road.mid similarity index 100% rename from sound/songs/midi/mus_c_road.mid rename to sound/songs/midi/mus_victory_road.mid diff --git a/sound/songs/midi/mus_kachi1.mid b/sound/songs/midi/mus_victory_trainer.mid similarity index 100% rename from sound/songs/midi/mus_kachi1.mid rename to sound/songs/midi/mus_victory_trainer.mid diff --git a/sound/songs/midi/mus_rg_win_yasei.mid b/sound/songs/midi/mus_victory_wild.mid similarity index 100% rename from sound/songs/midi/mus_rg_win_yasei.mid rename to sound/songs/midi/mus_victory_wild.mid diff --git a/sound/songs/midi/mus_battle31.mid b/sound/songs/midi/mus_vs_aqua_magma.mid similarity index 100% rename from sound/songs/midi/mus_battle31.mid rename to sound/songs/midi/mus_vs_aqua_magma.mid diff --git a/sound/songs/midi/mus_battle30.mid b/sound/songs/midi/mus_vs_aqua_magma_leader.mid similarity index 100% rename from sound/songs/midi/mus_battle30.mid rename to sound/songs/midi/mus_vs_aqua_magma_leader.mid diff --git a/sound/songs/midi/mus_battle33.mid b/sound/songs/midi/mus_vs_champion.mid similarity index 100% rename from sound/songs/midi/mus_battle33.mid rename to sound/songs/midi/mus_vs_champion.mid diff --git a/sound/songs/midi/mus_battle38.mid b/sound/songs/midi/mus_vs_elite_four.mid similarity index 100% rename from sound/songs/midi/mus_battle38.mid rename to sound/songs/midi/mus_vs_elite_four.mid diff --git a/sound/songs/midi/mus_vs_front.mid b/sound/songs/midi/mus_vs_frontier_brain.mid similarity index 100% rename from sound/songs/midi/mus_vs_front.mid rename to sound/songs/midi/mus_vs_frontier_brain.mid diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_vs_gym_leader.mid similarity index 100% rename from sound/songs/midi/mus_battle32.mid rename to sound/songs/midi/mus_vs_gym_leader.mid diff --git a/sound/songs/midi/mus_battle34.mid b/sound/songs/midi/mus_vs_kyogre_groudon.mid similarity index 100% rename from sound/songs/midi/mus_battle34.mid rename to sound/songs/midi/mus_vs_kyogre_groudon.mid diff --git a/sound/songs/midi/mus_vs_rekku.mid b/sound/songs/midi/mus_vs_rayquaza.mid similarity index 100% rename from sound/songs/midi/mus_vs_rekku.mid rename to sound/songs/midi/mus_vs_rayquaza.mid diff --git a/sound/songs/midi/mus_battle36.mid b/sound/songs/midi/mus_vs_regi.mid similarity index 100% rename from sound/songs/midi/mus_battle36.mid rename to sound/songs/midi/mus_vs_regi.mid diff --git a/sound/songs/midi/mus_battle35.mid b/sound/songs/midi/mus_vs_rival.mid similarity index 100% rename from sound/songs/midi/mus_battle35.mid rename to sound/songs/midi/mus_vs_rival.mid diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_vs_trainer.mid similarity index 100% rename from sound/songs/midi/mus_battle20.mid rename to sound/songs/midi/mus_vs_trainer.mid diff --git a/sound/songs/midi/mus_battle27.mid b/sound/songs/midi/mus_vs_wild.mid similarity index 100% rename from sound/songs/midi/mus_battle27.mid rename to sound/songs/midi/mus_vs_wild.mid diff --git a/sound/songs/midi/mus_hideri.mid b/sound/songs/midi/mus_weather_groudon.mid similarity index 100% rename from sound/songs/midi/mus_hideri.mid rename to sound/songs/midi/mus_weather_groudon.mid diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_applause.mid similarity index 100% rename from sound/songs/midi/se_dendou.mid rename to sound/songs/midi/se_applause.mid diff --git a/sound/songs/midi/se_hantei1.mid b/sound/songs/midi/se_arena_timeup1.mid similarity index 100% rename from sound/songs/midi/se_hantei1.mid rename to sound/songs/midi/se_arena_timeup1.mid diff --git a/sound/songs/midi/se_hantei2.mid b/sound/songs/midi/se_arena_timeup2.mid similarity index 100% rename from sound/songs/midi/se_hantei2.mid rename to sound/songs/midi/se_arena_timeup2.mid diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_ball.mid similarity index 100% rename from sound/songs/midi/se_bowa.mid rename to sound/songs/midi/se_ball.mid diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_ball_bounce_1.mid similarity index 100% rename from sound/songs/midi/se_kon.mid rename to sound/songs/midi/se_ball_bounce_1.mid diff --git a/sound/songs/midi/se_kon2.mid b/sound/songs/midi/se_ball_bounce_2.mid similarity index 100% rename from sound/songs/midi/se_kon2.mid rename to sound/songs/midi/se_ball_bounce_2.mid diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_ball_bounce_3.mid similarity index 100% rename from sound/songs/midi/se_kon3.mid rename to sound/songs/midi/se_ball_bounce_3.mid diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_ball_bounce_4.mid similarity index 100% rename from sound/songs/midi/se_kon4.mid rename to sound/songs/midi/se_ball_bounce_4.mid diff --git a/sound/songs/midi/se_bowa2.mid b/sound/songs/midi/se_ball_open.mid similarity index 100% rename from sound/songs/midi/se_bowa2.mid rename to sound/songs/midi/se_ball_open.mid diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_ball_throw.mid similarity index 100% rename from sound/songs/midi/se_nageru.mid rename to sound/songs/midi/se_ball_throw.mid diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_ball_trade.mid similarity index 100% rename from sound/songs/midi/se_suikomu.mid rename to sound/songs/midi/se_ball_trade.mid diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_ball_tray_ball.mid similarity index 100% rename from sound/songs/midi/se_tb_kon.mid rename to sound/songs/midi/se_ball_tray_ball.mid diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_ball_tray_enter.mid similarity index 100% rename from sound/songs/midi/se_tb_start.mid rename to sound/songs/midi/se_ball_tray_enter.mid diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_ball_tray_exit.mid similarity index 100% rename from sound/songs/midi/se_tb_kara.mid rename to sound/songs/midi/se_ball_tray_exit.mid diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_balloon_blue.mid similarity index 100% rename from sound/songs/midi/se_fuusen2.mid rename to sound/songs/midi/se_balloon_blue.mid diff --git a/sound/songs/midi/se_fuusen1.mid b/sound/songs/midi/se_balloon_red.mid similarity index 100% rename from sound/songs/midi/se_fuusen1.mid rename to sound/songs/midi/se_balloon_red.mid diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_balloon_yellow.mid similarity index 100% rename from sound/songs/midi/se_fuusen3.mid rename to sound/songs/midi/se_balloon_yellow.mid diff --git a/sound/songs/midi/se_ban.mid b/sound/songs/midi/se_bang.mid similarity index 100% rename from sound/songs/midi/se_ban.mid rename to sound/songs/midi/se_bang.mid diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_berry_blender.mid similarity index 100% rename from sound/songs/midi/se_moter.mid rename to sound/songs/midi/se_berry_blender.mid diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_bike_bell.mid similarity index 100% rename from sound/songs/midi/se_jitensya.mid rename to sound/songs/midi/se_bike_bell.mid diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_bike_hop.mid similarity index 100% rename from sound/songs/midi/se_jite_pyoko.mid rename to sound/songs/midi/se_bike_hop.mid diff --git a/sound/songs/midi/se_toy_kabe.mid b/sound/songs/midi/se_breakable_door.mid similarity index 100% rename from sound/songs/midi/se_toy_kabe.mid rename to sound/songs/midi/se_breakable_door.mid diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_bridge_walk.mid similarity index 100% rename from sound/songs/midi/se_hashi.mid rename to sound/songs/midi/se_bridge_walk.mid diff --git a/sound/songs/midi/se_tk_kasya.mid b/sound/songs/midi/se_click.mid similarity index 100% rename from sound/songs/midi/se_tk_kasya.mid rename to sound/songs/midi/se_click.mid diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_contest_condition_lose.mid similarity index 100% rename from sound/songs/midi/se_fu_zaku2.mid rename to sound/songs/midi/se_contest_condition_lose.mid diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_contest_curtain_fall.mid similarity index 100% rename from sound/songs/midi/se_c_maku_d.mid rename to sound/songs/midi/se_contest_curtain_fall.mid diff --git a/sound/songs/midi/se_c_maku_u.mid b/sound/songs/midi/se_contest_curtain_rise.mid similarity index 100% rename from sound/songs/midi/se_c_maku_u.mid rename to sound/songs/midi/se_contest_curtain_rise.mid diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_contest_heart.mid similarity index 100% rename from sound/songs/midi/se_c_gaji.mid rename to sound/songs/midi/se_contest_heart.mid diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_contest_icon_change.mid similarity index 100% rename from sound/songs/midi/se_c_pasi.mid rename to sound/songs/midi/se_contest_icon_change.mid diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_contest_icon_clear.mid similarity index 100% rename from sound/songs/midi/se_c_syu.mid rename to sound/songs/midi/se_contest_icon_clear.mid diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_contest_mons_turn.mid similarity index 100% rename from sound/songs/midi/se_c_pikon.mid rename to sound/songs/midi/se_contest_mons_turn.mid diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_contest_place.mid similarity index 100% rename from sound/songs/midi/se_jyuni.mid rename to sound/songs/midi/se_contest_place.mid diff --git a/sound/songs/midi/se_z_search.mid b/sound/songs/midi/se_dex_search.mid similarity index 100% rename from sound/songs/midi/se_z_search.mid rename to sound/songs/midi/se_dex_search.mid diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_ding_dong.mid similarity index 100% rename from sound/songs/midi/se_pinpon.mid rename to sound/songs/midi/se_ding_dong.mid diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_downpour.mid similarity index 100% rename from sound/songs/midi/se_t_ooame.mid rename to sound/songs/midi/se_downpour.mid diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_downpour_stop.mid similarity index 100% rename from sound/songs/midi/se_t_ooame_e.mid rename to sound/songs/midi/se_downpour_stop.mid diff --git a/sound/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_effective.mid similarity index 100% rename from sound/songs/midi/se_kouka_m.mid rename to sound/songs/midi/se_effective.mid diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_egg_hatch.mid similarity index 100% rename from sound/songs/midi/se_tamago.mid rename to sound/songs/midi/se_egg_hatch.mid diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elevator.mid similarity index 100% rename from sound/songs/midi/se_elebeta.mid rename to sound/songs/midi/se_elevator.mid diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_escalator.mid similarity index 100% rename from sound/songs/midi/se_esuka.mid rename to sound/songs/midi/se_escalator.mid diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_exit.mid similarity index 100% rename from sound/songs/midi/se_kaidan.mid rename to sound/songs/midi/se_exit.mid diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_exp_max.mid similarity index 100% rename from sound/songs/midi/se_expmax.mid rename to sound/songs/midi/se_exp_max.mid diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_failure.mid similarity index 100% rename from sound/songs/midi/se_hazure.mid rename to sound/songs/midi/se_failure.mid diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_faint.mid similarity index 100% rename from sound/songs/midi/se_poke_dead.mid rename to sound/songs/midi/se_faint.mid diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_fall.mid similarity index 100% rename from sound/songs/midi/se_ru_hyuu.mid rename to sound/songs/midi/se_fall.mid diff --git a/sound/songs/midi/se_doku.mid b/sound/songs/midi/se_field_poison.mid similarity index 100% rename from sound/songs/midi/se_doku.mid rename to sound/songs/midi/se_field_poison.mid diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_flee.mid similarity index 100% rename from sound/songs/midi/se_nigeru.mid rename to sound/songs/midi/se_flee.mid diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_glass_flute.mid similarity index 100% rename from sound/songs/midi/se_bidoro.mid rename to sound/songs/midi/se_glass_flute.mid diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ice_break.mid similarity index 100% rename from sound/songs/midi/se_ru_gasyan.mid rename to sound/songs/midi/se_ice_break.mid diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ice_crack.mid similarity index 100% rename from sound/songs/midi/se_ru_bari.mid rename to sound/songs/midi/se_ice_crack.mid diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ice_stairs.mid similarity index 100% rename from sound/songs/midi/se_ru_gashin.mid rename to sound/songs/midi/se_ice_stairs.mid diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_intro_blast.mid similarity index 100% rename from sound/songs/midi/se_op_basyu.mid rename to sound/songs/midi/se_intro_blast.mid diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_itemfinder.mid similarity index 100% rename from sound/songs/midi/se_daugi.mid rename to sound/songs/midi/se_itemfinder.mid diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_lavaridge_fall_warp.mid similarity index 100% rename from sound/songs/midi/se_fu_zuzuzu.mid rename to sound/songs/midi/se_lavaridge_fall_warp.mid diff --git a/sound/songs/midi/se_dansa.mid b/sound/songs/midi/se_ledge.mid similarity index 100% rename from sound/songs/midi/se_dansa.mid rename to sound/songs/midi/se_ledge.mid diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_low_health.mid similarity index 100% rename from sound/songs/midi/se_hinsi.mid rename to sound/songs/midi/se_low_health.mid diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_m_bind.mid similarity index 100% rename from sound/songs/midi/se_w020.mid rename to sound/songs/midi/se_m_bind.mid diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_m_comet_punch.mid similarity index 100% rename from sound/songs/midi/se_w004.mid rename to sound/songs/midi/se_m_comet_punch.mid diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_m_cut.mid similarity index 100% rename from sound/songs/midi/se_w015.mid rename to sound/songs/midi/se_m_cut.mid diff --git a/sound/songs/midi/se_w003.mid b/sound/songs/midi/se_m_double_slap.mid similarity index 100% rename from sound/songs/midi/se_w003.mid rename to sound/songs/midi/se_m_double_slap.mid diff --git a/sound/songs/midi/se_w007.mid b/sound/songs/midi/se_m_fire_punch.mid similarity index 100% rename from sound/songs/midi/se_w007.mid rename to sound/songs/midi/se_m_fire_punch.mid diff --git a/sound/songs/midi/se_w019.mid b/sound/songs/midi/se_m_fly.mid similarity index 100% rename from sound/songs/midi/se_w019.mid rename to sound/songs/midi/se_m_fly.mid diff --git a/sound/songs/midi/se_w016.mid b/sound/songs/midi/se_m_gust.mid similarity index 100% rename from sound/songs/midi/se_w016.mid rename to sound/songs/midi/se_m_gust.mid diff --git a/sound/songs/midi/se_w016b.mid b/sound/songs/midi/se_m_gust2.mid similarity index 100% rename from sound/songs/midi/se_w016b.mid rename to sound/songs/midi/se_m_gust2.mid diff --git a/sound/songs/midi/se_w029.mid b/sound/songs/midi/se_m_headbutt.mid similarity index 100% rename from sound/songs/midi/se_w029.mid rename to sound/songs/midi/se_m_headbutt.mid diff --git a/sound/songs/midi/se_w030.mid b/sound/songs/midi/se_m_horn_attack.mid similarity index 100% rename from sound/songs/midi/se_w030.mid rename to sound/songs/midi/se_m_horn_attack.mid diff --git a/sound/songs/midi/se_w026.mid b/sound/songs/midi/se_m_jump_kick.mid similarity index 100% rename from sound/songs/midi/se_w026.mid rename to sound/songs/midi/se_m_jump_kick.mid diff --git a/sound/songs/midi/se_w043.mid b/sound/songs/midi/se_m_leer.mid similarity index 100% rename from sound/songs/midi/se_w043.mid rename to sound/songs/midi/se_m_leer.mid diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_m_mega_kick.mid similarity index 100% rename from sound/songs/midi/se_w025.mid rename to sound/songs/midi/se_m_mega_kick.mid diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_m_mega_kick2.mid similarity index 100% rename from sound/songs/midi/se_w025b.mid rename to sound/songs/midi/se_m_mega_kick2.mid diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_m_pay_day.mid similarity index 100% rename from sound/songs/midi/se_w006.mid rename to sound/songs/midi/se_m_pay_day.mid diff --git a/sound/songs/midi/se_w013.mid b/sound/songs/midi/se_m_razor_wind.mid similarity index 100% rename from sound/songs/midi/se_w013.mid rename to sound/songs/midi/se_m_razor_wind.mid diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_m_razor_wind2.mid similarity index 100% rename from sound/songs/midi/se_w013b.mid rename to sound/songs/midi/se_m_razor_wind2.mid diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_m_sand_attack.mid similarity index 100% rename from sound/songs/midi/se_w028.mid rename to sound/songs/midi/se_m_sand_attack.mid diff --git a/sound/songs/midi/se_w010.mid b/sound/songs/midi/se_m_scratch.mid similarity index 100% rename from sound/songs/midi/se_w010.mid rename to sound/songs/midi/se_m_scratch.mid diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_m_swords_dance.mid similarity index 100% rename from sound/songs/midi/se_w014.mid rename to sound/songs/midi/se_m_swords_dance.mid diff --git a/sound/songs/midi/se_w039.mid b/sound/songs/midi/se_m_tail_whip.mid similarity index 100% rename from sound/songs/midi/se_w039.mid rename to sound/songs/midi/se_m_tail_whip.mid diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_m_take_down.mid similarity index 100% rename from sound/songs/midi/se_w036.mid rename to sound/songs/midi/se_m_take_down.mid diff --git a/sound/songs/midi/se_w011.mid b/sound/songs/midi/se_m_vicegrip.mid similarity index 100% rename from sound/songs/midi/se_w011.mid rename to sound/songs/midi/se_m_vicegrip.mid diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_m_wing_attack.mid similarity index 100% rename from sound/songs/midi/se_w017.mid rename to sound/songs/midi/se_m_wing_attack.mid diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_mud_ball.mid similarity index 100% rename from sound/songs/midi/se_toy_dango.mid rename to sound/songs/midi/se_mud_ball.mid diff --git a/sound/songs/midi/se_bt_start.mid b/sound/songs/midi/se_mugshot.mid similarity index 100% rename from sound/songs/midi/se_bt_start.mid rename to sound/songs/midi/se_mugshot.mid diff --git a/sound/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_not_effective.mid similarity index 100% rename from sound/songs/midi/se_kouka_l.mid rename to sound/songs/midi/se_not_effective.mid diff --git a/sound/songs/midi/se_toy_a.mid b/sound/songs/midi/se_note_a.mid similarity index 100% rename from sound/songs/midi/se_toy_a.mid rename to sound/songs/midi/se_note_a.mid diff --git a/sound/songs/midi/se_toy_b.mid b/sound/songs/midi/se_note_b.mid similarity index 100% rename from sound/songs/midi/se_toy_b.mid rename to sound/songs/midi/se_note_b.mid diff --git a/sound/songs/midi/se_toy_c.mid b/sound/songs/midi/se_note_c.mid similarity index 100% rename from sound/songs/midi/se_toy_c.mid rename to sound/songs/midi/se_note_c.mid diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_note_c_high.mid similarity index 100% rename from sound/songs/midi/se_toy_c1.mid rename to sound/songs/midi/se_note_c_high.mid diff --git a/sound/songs/midi/se_toy_d.mid b/sound/songs/midi/se_note_d.mid similarity index 100% rename from sound/songs/midi/se_toy_d.mid rename to sound/songs/midi/se_note_d.mid diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_note_e.mid similarity index 100% rename from sound/songs/midi/se_toy_e.mid rename to sound/songs/midi/se_note_e.mid diff --git a/sound/songs/midi/se_toy_f.mid b/sound/songs/midi/se_note_f.mid similarity index 100% rename from sound/songs/midi/se_toy_f.mid rename to sound/songs/midi/se_note_f.mid diff --git a/sound/songs/midi/se_toy_g.mid b/sound/songs/midi/se_note_g.mid similarity index 100% rename from sound/songs/midi/se_toy_g.mid rename to sound/songs/midi/se_note_g.mid diff --git a/sound/songs/midi/se_tama.mid b/sound/songs/midi/se_orb.mid similarity index 100% rename from sound/songs/midi/se_tama.mid rename to sound/songs/midi/se_orb.mid diff --git a/sound/songs/midi/se_curtain.mid b/sound/songs/midi/se_pike_curtain_close.mid similarity index 100% rename from sound/songs/midi/se_curtain.mid rename to sound/songs/midi/se_pike_curtain_close.mid diff --git a/sound/songs/midi/se_curtain1.mid b/sound/songs/midi/se_pike_curtain_open.mid similarity index 100% rename from sound/songs/midi/se_curtain1.mid rename to sound/songs/midi/se_pike_curtain_open.mid diff --git a/sound/songs/midi/se_toreeye.mid b/sound/songs/midi/se_pokenav_call.mid similarity index 100% rename from sound/songs/midi/se_toreeye.mid rename to sound/songs/midi/se_pokenav_call.mid diff --git a/sound/songs/midi/se_toreoff.mid b/sound/songs/midi/se_pokenav_hang_up.mid similarity index 100% rename from sound/songs/midi/se_toreoff.mid rename to sound/songs/midi/se_pokenav_hang_up.mid diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pokenav_off.mid similarity index 100% rename from sound/songs/midi/se_pn_off.mid rename to sound/songs/midi/se_pokenav_off.mid diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pokenav_on.mid similarity index 100% rename from sound/songs/midi/se_pn_on.mid rename to sound/songs/midi/se_pokenav_on.mid diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_puddle.mid similarity index 100% rename from sound/songs/midi/se_mizu.mid rename to sound/songs/midi/se_puddle.mid diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_rain.mid similarity index 100% rename from sound/songs/midi/se_t_koame.mid rename to sound/songs/midi/se_rain.mid diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_rain_stop.mid similarity index 100% rename from sound/songs/midi/se_t_koame_e.mid rename to sound/songs/midi/se_rain_stop.mid diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_repel.mid similarity index 100% rename from sound/songs/midi/se_tu_saa.mid rename to sound/songs/midi/se_repel.mid diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag_cursor.mid similarity index 100% rename from sound/songs/midi/se_rg_bag1.mid rename to sound/songs/midi/se_rg_bag_cursor.mid diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag_pocket.mid similarity index 100% rename from sound/songs/midi/se_rg_bag2.mid rename to sound/songs/midi/se_rg_bag_pocket.mid diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_ball_click.mid similarity index 100% rename from sound/songs/midi/se_rg_getting.mid rename to sound/songs/midi/se_rg_ball_click.mid diff --git a/sound/songs/midi/se_rg_card1.mid b/sound/songs/midi/se_rg_card_flip.mid similarity index 100% rename from sound/songs/midi/se_rg_card1.mid rename to sound/songs/midi/se_rg_card_flip.mid diff --git a/sound/songs/midi/se_rg_card2.mid b/sound/songs/midi/se_rg_card_flipping.mid similarity index 100% rename from sound/songs/midi/se_rg_card2.mid rename to sound/songs/midi/se_rg_card_flipping.mid diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card_open.mid similarity index 100% rename from sound/songs/midi/se_rg_card3.mid rename to sound/songs/midi/se_rg_card_open.mid diff --git a/sound/songs/midi/se_rg_deomov.mid b/sound/songs/midi/se_rg_deoxys_move.mid similarity index 100% rename from sound/songs/midi/se_rg_deomov.mid rename to sound/songs/midi/se_rg_deoxys_move.mid diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_door.mid similarity index 100% rename from sound/songs/midi/se_rg_w_door.mid rename to sound/songs/midi/se_rg_door.mid diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_close.mid similarity index 100% rename from sound/songs/midi/se_rg_help_cl.mid rename to sound/songs/midi/se_rg_help_close.mid diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_error.mid similarity index 100% rename from sound/songs/midi/se_rg_help_ng.mid rename to sound/songs/midi/se_rg_help_error.mid diff --git a/sound/songs/midi/se_rg_help_op.mid b/sound/songs/midi/se_rg_help_open.mid similarity index 100% rename from sound/songs/midi/se_rg_help_op.mid rename to sound/songs/midi/se_rg_help_open.mid diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_poke_jump_failure.mid similarity index 100% rename from sound/songs/midi/se_rg_nawamiss.mid rename to sound/songs/midi/se_rg_poke_jump_failure.mid diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_poke_jump_success.mid similarity index 100% rename from sound/songs/midi/se_rg_excellent.mid rename to sound/songs/midi/se_rg_poke_jump_success.mid diff --git a/sound/songs/midi/se_rg_kiteki.mid b/sound/songs/midi/se_rg_ss_anne_horn.mid similarity index 100% rename from sound/songs/midi/se_rg_kiteki.mid rename to sound/songs/midi/se_rg_ss_anne_horn.mid diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_rotating_gate.mid similarity index 100% rename from sound/songs/midi/se_hi_turun.mid rename to sound/songs/midi/se_rotating_gate.mid diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_roulette_ball.mid similarity index 100% rename from sound/songs/midi/se_tamakoro.mid rename to sound/songs/midi/se_roulette_ball.mid diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_roulette_ball2.mid similarity index 100% rename from sound/songs/midi/se_tamakoro_e.mid rename to sound/songs/midi/se_roulette_ball2.mid diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_shiny.mid similarity index 100% rename from sound/songs/midi/se_reapoke.mid rename to sound/songs/midi/se_shiny.mid diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_ship.mid similarity index 100% rename from sound/songs/midi/se_naminori.mid rename to sound/songs/midi/se_ship.mid diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_shop.mid similarity index 100% rename from sound/songs/midi/se_regi.mid rename to sound/songs/midi/se_shop.mid diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_sliding_door.mid similarity index 100% rename from sound/songs/midi/se_jido_doa.mid rename to sound/songs/midi/se_sliding_door.mid diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_success.mid similarity index 100% rename from sound/songs/midi/se_seikai.mid rename to sound/songs/midi/se_success.mid diff --git a/sound/songs/midi/se_ussoki.mid b/sound/songs/midi/se_sudowoodo_shake.mid similarity index 100% rename from sound/songs/midi/se_ussoki.mid rename to sound/songs/midi/se_sudowoodo_shake.mid diff --git a/sound/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_super_effective.mid similarity index 100% rename from sound/songs/midi/se_kouka_h.mid rename to sound/songs/midi/se_super_effective.mid diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_switch.mid similarity index 100% rename from sound/songs/midi/se_mu_pachi.mid rename to sound/songs/midi/se_switch.mid diff --git a/sound/songs/midi/se_basabasa.mid b/sound/songs/midi/se_taillow_wing_flap.mid similarity index 100% rename from sound/songs/midi/se_basabasa.mid rename to sound/songs/midi/se_taillow_wing_flap.mid diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_thunder.mid similarity index 100% rename from sound/songs/midi/se_t_kami.mid rename to sound/songs/midi/se_thunder.mid diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_thunder2.mid similarity index 100% rename from sound/songs/midi/se_t_kami2.mid rename to sound/songs/midi/se_thunder2.mid diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_thunderstorm.mid similarity index 100% rename from sound/songs/midi/se_t_ame.mid rename to sound/songs/midi/se_thunderstorm.mid diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_thunderstorm_stop.mid similarity index 100% rename from sound/songs/midi/se_t_ame_e.mid rename to sound/songs/midi/se_thunderstorm_stop.mid diff --git a/sound/songs/midi/se_track_door.mid b/sound/songs/midi/se_truck_door.mid similarity index 100% rename from sound/songs/midi/se_track_door.mid rename to sound/songs/midi/se_truck_door.mid diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_truck_move.mid similarity index 100% rename from sound/songs/midi/se_track_move.mid rename to sound/songs/midi/se_truck_move.mid diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_truck_stop.mid similarity index 100% rename from sound/songs/midi/se_track_stop.mid rename to sound/songs/midi/se_truck_stop.mid diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_truck_unload.mid similarity index 100% rename from sound/songs/midi/se_track_haiki.mid rename to sound/songs/midi/se_truck_unload.mid diff --git a/sound/songs/midi/se_ki_gasyan.mid b/sound/songs/midi/se_unlock.mid similarity index 100% rename from sound/songs/midi/se_ki_gasyan.mid rename to sound/songs/midi/se_unlock.mid diff --git a/sound/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_use_item.mid similarity index 100% rename from sound/songs/midi/se_kaifuku.mid rename to sound/songs/midi/se_use_item.mid diff --git a/sound/songs/midi/se_jihanki.mid b/sound/songs/midi/se_vend.mid similarity index 100% rename from sound/songs/midi/se_jihanki.mid rename to sound/songs/midi/se_vend.mid diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_warp_in.mid similarity index 100% rename from sound/songs/midi/se_tk_warpin.mid rename to sound/songs/midi/se_warp_in.mid diff --git a/sound/songs/midi/se_tk_warpout.mid b/sound/songs/midi/se_warp_out.mid similarity index 100% rename from sound/songs/midi/se_tk_warpout.mid rename to sound/songs/midi/se_warp_out.mid diff --git a/sound/songs/se_z_page.s b/sound/songs/se_dex_page.s similarity index 53% rename from sound/songs/se_z_page.s rename to sound/songs/se_dex_page.s index a767bf5adc..884f0d12a5 100644 --- a/sound/songs/se_z_page.s +++ b/sound/songs/se_dex_page.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_z_page_grp, voicegroup127 - .equ se_z_page_pri, 5 - .equ se_z_page_rev, reverb_set+50 - .equ se_z_page_mvl, 127 - .equ se_z_page_key, 0 - .equ se_z_page_tbs, 1 - .equ se_z_page_exg, 0 - .equ se_z_page_cmp, 1 + .equ se_dex_page_grp, voicegroup127 + .equ se_dex_page_pri, 5 + .equ se_dex_page_rev, reverb_set+50 + .equ se_dex_page_mvl, 127 + .equ se_dex_page_key, 0 + .equ se_dex_page_tbs, 1 + .equ se_dex_page_exg, 0 + .equ se_dex_page_cmp, 1 .section .rodata - .global se_z_page + .global se_dex_page .align 2 @********************** Track 1 **********************@ -se_z_page_1: - .byte KEYSH , se_z_page_key+0 - .byte TEMPO , 100*se_z_page_tbs/2 +se_dex_page_1: + .byte KEYSH , se_dex_page_key+0 + .byte TEMPO , 100*se_dex_page_tbs/2 .byte VOICE , 4 .byte BENDR , 12 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 90*se_z_page_mvl/mxv + .byte VOL , 90*se_dex_page_mvl/mxv .byte BEND , c_v+4 .byte N01 , Cn5 , v064 .byte W01 @@ -41,14 +41,14 @@ se_z_page_1: @******************************************************@ .align 2 -se_z_page: +se_dex_page: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_z_page_pri @ Priority - .byte se_z_page_rev @ Reverb. + .byte se_dex_page_pri @ Priority + .byte se_dex_page_rev @ Reverb. - .word se_z_page_grp + .word se_dex_page_grp - .word se_z_page_1 + .word se_dex_page_1 .end diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s new file mode 100644 index 0000000000..6c7ad77461 --- /dev/null +++ b/sound/songs/se_dex_scroll.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_dex_scroll_grp, voicegroup127 + .equ se_dex_scroll_pri, 5 + .equ se_dex_scroll_rev, reverb_set+50 + .equ se_dex_scroll_mvl, 127 + .equ se_dex_scroll_key, 0 + .equ se_dex_scroll_tbs, 1 + .equ se_dex_scroll_exg, 0 + .equ se_dex_scroll_cmp, 1 + + .section .rodata + .global se_dex_scroll + .align 2 + +@********************** Track 1 **********************@ + +se_dex_scroll_1: + .byte KEYSH , se_dex_scroll_key+0 + .byte TEMPO , 100*se_dex_scroll_tbs/2 + .byte VOICE , 4 + .byte BENDR , 12 + .byte XCMD , xIECV , 10 + .byte xIECL , 8 + .byte VOL , 40*se_dex_scroll_mvl/mxv + .byte BEND , c_v+4 + .byte N01 , Gn4 , v127 + .byte W01 + .byte Gn4 , v020 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_dex_scroll: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_dex_scroll_pri @ Priority + .byte se_dex_scroll_rev @ Reverb. + + .word se_dex_scroll_grp + + .word se_dex_scroll_1 + + .end diff --git a/sound/songs/se_w071.s b/sound/songs/se_m_absorb.s similarity index 50% rename from sound/songs/se_w071.s rename to sound/songs/se_m_absorb.s index 3f1e008b96..35213fdaa9 100644 --- a/sound/songs/se_w071.s +++ b/sound/songs/se_m_absorb.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w071_grp, voicegroup128 - .equ se_w071_pri, 4 - .equ se_w071_rev, reverb_set+50 - .equ se_w071_mvl, 127 - .equ se_w071_key, 0 - .equ se_w071_tbs, 1 - .equ se_w071_exg, 0 - .equ se_w071_cmp, 1 + .equ se_m_absorb_grp, voicegroup128 + .equ se_m_absorb_pri, 4 + .equ se_m_absorb_rev, reverb_set+50 + .equ se_m_absorb_mvl, 127 + .equ se_m_absorb_key, 0 + .equ se_m_absorb_tbs, 1 + .equ se_m_absorb_exg, 0 + .equ se_m_absorb_cmp, 1 .section .rodata - .global se_w071 + .global se_m_absorb .align 2 @********************** Track 1 **********************@ -se_w071_1: - .byte KEYSH , se_w071_key+0 - .byte TEMPO , 150*se_w071_tbs/2 +se_m_absorb_1: + .byte KEYSH , se_m_absorb_key+0 + .byte TEMPO , 150*se_m_absorb_tbs/2 .byte VOICE , 24 - .byte VOL , 110*se_w071_mvl/mxv + .byte VOL , 110*se_m_absorb_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -28,30 +28,30 @@ se_w071_1: .byte Gn6 , v112 .byte W01 .byte VOICE , 38 - .byte VOL , 58*se_w071_mvl/mxv + .byte VOL , 58*se_m_absorb_mvl/mxv .byte N08 , Gn4 .byte W01 - .byte VOL , 68*se_w071_mvl/mxv + .byte VOL , 68*se_m_absorb_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v-20 .byte W01 - .byte VOL , 75*se_w071_mvl/mxv + .byte VOL , 75*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v-48 .byte W02 - .byte VOL , 83*se_w071_mvl/mxv + .byte VOL , 83*se_m_absorb_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v-18 .byte W01 - .byte VOL , 90*se_w071_mvl/mxv + .byte VOL , 90*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+10 .byte W01 - .byte VOL , 101*se_w071_mvl/mxv + .byte VOL , 101*se_m_absorb_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v+39 .byte W01 - .byte VOL , 110*se_w071_mvl/mxv + .byte VOL , 110*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+63 .byte W03 @@ -60,14 +60,14 @@ se_w071_1: @******************************************************@ .align 2 -se_w071: +se_m_absorb: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w071_pri @ Priority - .byte se_w071_rev @ Reverb. + .byte se_m_absorb_pri @ Priority + .byte se_m_absorb_rev @ Reverb. - .word se_w071_grp + .word se_m_absorb_grp - .word se_w071_1 + .word se_m_absorb_1 .end diff --git a/sound/songs/se_w071b.s b/sound/songs/se_m_absorb_2.s similarity index 77% rename from sound/songs/se_w071b.s rename to sound/songs/se_m_absorb_2.s index 81d8fe8c7e..3f9df6dc40 100644 --- a/sound/songs/se_w071b.s +++ b/sound/songs/se_m_absorb_2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w071b_grp, voicegroup128 - .equ se_w071b_pri, 4 - .equ se_w071b_rev, reverb_set+50 - .equ se_w071b_mvl, 127 - .equ se_w071b_key, 0 - .equ se_w071b_tbs, 1 - .equ se_w071b_exg, 0 - .equ se_w071b_cmp, 1 + .equ se_m_absorb_2_grp, voicegroup128 + .equ se_m_absorb_2_pri, 4 + .equ se_m_absorb_2_rev, reverb_set+50 + .equ se_m_absorb_2_mvl, 127 + .equ se_m_absorb_2_key, 0 + .equ se_m_absorb_2_tbs, 1 + .equ se_m_absorb_2_exg, 0 + .equ se_m_absorb_2_cmp, 1 .section .rodata - .global se_w071b + .global se_m_absorb_2 .align 2 @********************** Track 1 **********************@ -se_w071b_1: - .byte KEYSH , se_w071b_key+0 - .byte TEMPO , 150*se_w071b_tbs/2 +se_m_absorb_2_1: + .byte KEYSH , se_m_absorb_2_key+0 + .byte TEMPO , 150*se_m_absorb_2_tbs/2 .byte VOICE , 46 - .byte VOL , 110*se_w071b_mvl/mxv + .byte VOL , 110*se_m_absorb_2_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -81,11 +81,11 @@ se_w071b_1: @********************** Track 2 **********************@ -se_w071b_2: - .byte KEYSH , se_w071b_key+0 +se_m_absorb_2_2: + .byte KEYSH , se_m_absorb_2_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w071b_mvl/mxv + .byte VOL , 43*se_m_absorb_2_mvl/mxv .byte BEND , c_v+15 .byte N02 , An6 , v112 .byte W02 @@ -141,15 +141,15 @@ se_w071b_2: @******************************************************@ .align 2 -se_w071b: +se_m_absorb_2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w071b_pri @ Priority - .byte se_w071b_rev @ Reverb. + .byte se_m_absorb_2_pri @ Priority + .byte se_m_absorb_2_rev @ Reverb. - .word se_w071b_grp + .word se_m_absorb_2_grp - .word se_w071b_1 - .word se_w071b_2 + .word se_m_absorb_2_1 + .word se_m_absorb_2_2 .end diff --git a/sound/songs/se_w151.s b/sound/songs/se_m_acid_armor.s similarity index 85% rename from sound/songs/se_w151.s rename to sound/songs/se_m_acid_armor.s index c012b2d5f5..c7f350a9b5 100644 --- a/sound/songs/se_w151.s +++ b/sound/songs/se_m_acid_armor.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w151_grp, voicegroup128 - .equ se_w151_pri, 4 - .equ se_w151_rev, reverb_set+50 - .equ se_w151_mvl, 127 - .equ se_w151_key, 0 - .equ se_w151_tbs, 1 - .equ se_w151_exg, 0 - .equ se_w151_cmp, 1 + .equ se_m_acid_armor_grp, voicegroup128 + .equ se_m_acid_armor_pri, 4 + .equ se_m_acid_armor_rev, reverb_set+50 + .equ se_m_acid_armor_mvl, 127 + .equ se_m_acid_armor_key, 0 + .equ se_m_acid_armor_tbs, 1 + .equ se_m_acid_armor_exg, 0 + .equ se_m_acid_armor_cmp, 1 .section .rodata - .global se_w151 + .global se_m_acid_armor .align 2 @********************** Track 1 **********************@ -se_w151_1: - .byte KEYSH , se_w151_key+0 - .byte TEMPO , 150*se_w151_tbs/2 +se_m_acid_armor_1: + .byte KEYSH , se_m_acid_armor_key+0 + .byte TEMPO , 150*se_m_acid_armor_tbs/2 .byte VOICE , 31 - .byte VOL , 110*se_w151_mvl/mxv + .byte VOL , 110*se_m_acid_armor_mvl/mxv .byte BENDR , 24 .byte PAN , c_v+0 .byte BEND , c_v-37 @@ -189,14 +189,14 @@ se_w151_1: @******************************************************@ .align 2 -se_w151: +se_m_acid_armor: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w151_pri @ Priority - .byte se_w151_rev @ Reverb. + .byte se_m_acid_armor_pri @ Priority + .byte se_m_acid_armor_rev @ Reverb. - .word se_w151_grp + .word se_m_acid_armor_grp - .word se_w151_1 + .word se_m_acid_armor_1 .end diff --git a/sound/songs/se_w213.s b/sound/songs/se_m_attract.s similarity index 72% rename from sound/songs/se_w213.s rename to sound/songs/se_m_attract.s index b35e17038e..8e18c16dce 100644 --- a/sound/songs/se_w213.s +++ b/sound/songs/se_m_attract.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w213_grp, voicegroup128 - .equ se_w213_pri, 4 - .equ se_w213_rev, reverb_set+50 - .equ se_w213_mvl, 127 - .equ se_w213_key, 0 - .equ se_w213_tbs, 1 - .equ se_w213_exg, 0 - .equ se_w213_cmp, 1 + .equ se_m_attract_grp, voicegroup128 + .equ se_m_attract_pri, 4 + .equ se_m_attract_rev, reverb_set+50 + .equ se_m_attract_mvl, 127 + .equ se_m_attract_key, 0 + .equ se_m_attract_tbs, 1 + .equ se_m_attract_exg, 0 + .equ se_m_attract_cmp, 1 .section .rodata - .global se_w213 + .global se_m_attract .align 2 @********************** Track 1 **********************@ -se_w213_1: - .byte KEYSH , se_w213_key+0 - .byte TEMPO , 210*se_w213_tbs/2 +se_m_attract_1: + .byte KEYSH , se_m_attract_key+0 + .byte TEMPO , 210*se_m_attract_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w213_mvl/mxv + .byte VOL , 95*se_m_attract_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -67,11 +67,11 @@ se_w213_1: @********************** Track 2 **********************@ -se_w213_2: - .byte KEYSH , se_w213_key+0 +se_m_attract_2: + .byte KEYSH , se_m_attract_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w213_mvl/mxv + .byte VOL , 43*se_m_attract_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , Cn5 , v120 @@ -112,15 +112,15 @@ se_w213_2: @******************************************************@ .align 2 -se_w213: +se_m_attract: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w213_pri @ Priority - .byte se_w213_rev @ Reverb. + .byte se_m_attract_pri @ Priority + .byte se_m_attract_rev @ Reverb. - .word se_w213_grp + .word se_m_attract_grp - .word se_w213_1 - .word se_w213_2 + .word se_m_attract_1 + .word se_m_attract_2 .end diff --git a/sound/songs/se_w213b.s b/sound/songs/se_m_attract2.s similarity index 72% rename from sound/songs/se_w213b.s rename to sound/songs/se_m_attract2.s index b7da4378e6..7d3d6f3c55 100644 --- a/sound/songs/se_w213b.s +++ b/sound/songs/se_m_attract2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w213b_grp, voicegroup128 - .equ se_w213b_pri, 4 - .equ se_w213b_rev, reverb_set+50 - .equ se_w213b_mvl, 127 - .equ se_w213b_key, 0 - .equ se_w213b_tbs, 1 - .equ se_w213b_exg, 0 - .equ se_w213b_cmp, 1 + .equ se_m_attract2_grp, voicegroup128 + .equ se_m_attract2_pri, 4 + .equ se_m_attract2_rev, reverb_set+50 + .equ se_m_attract2_mvl, 127 + .equ se_m_attract2_key, 0 + .equ se_m_attract2_tbs, 1 + .equ se_m_attract2_exg, 0 + .equ se_m_attract2_cmp, 1 .section .rodata - .global se_w213b + .global se_m_attract2 .align 2 @********************** Track 1 **********************@ -se_w213b_1: - .byte KEYSH , se_w213b_key+0 - .byte TEMPO , 150*se_w213b_tbs/2 +se_m_attract2_1: + .byte KEYSH , se_m_attract2_key+0 + .byte TEMPO , 150*se_m_attract2_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 - .byte VOL , 110*se_w213b_mvl/mxv + .byte VOL , 110*se_m_attract2_mvl/mxv .byte MOD , 30 .byte BEND , c_v+2 .byte N54 , Dn4 , v080 @@ -69,11 +69,11 @@ se_w213b_1: @********************** Track 2 **********************@ -se_w213b_2: - .byte KEYSH , se_w213b_key+0 +se_m_attract2_2: + .byte KEYSH , se_m_attract2_key+0 .byte VOICE , 62 .byte BENDR , 44 - .byte VOL , 110*se_w213b_mvl/mxv + .byte VOL , 110*se_m_attract2_mvl/mxv .byte MOD , 30 .byte PAN , c_v+1 .byte BEND , c_v+1 @@ -113,15 +113,15 @@ se_w213b_2: @******************************************************@ .align 2 -se_w213b: +se_m_attract2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w213b_pri @ Priority - .byte se_w213b_rev @ Reverb. + .byte se_m_attract2_pri @ Priority + .byte se_m_attract2_rev @ Reverb. - .word se_w213b_grp + .word se_m_attract2_grp - .word se_w213b_1 - .word se_w213b_2 + .word se_m_attract2_1 + .word se_m_attract2_2 .end diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s new file mode 100644 index 0000000000..54d57700f0 --- /dev/null +++ b/sound/songs/se_m_barrier.s @@ -0,0 +1,276 @@ + .include "MPlayDef.s" + + .equ se_m_barrier_grp, voicegroup128 + .equ se_m_barrier_pri, 4 + .equ se_m_barrier_rev, reverb_set+50 + .equ se_m_barrier_mvl, 127 + .equ se_m_barrier_key, 0 + .equ se_m_barrier_tbs, 1 + .equ se_m_barrier_exg, 0 + .equ se_m_barrier_cmp, 1 + + .section .rodata + .global se_m_barrier + .align 2 + +@********************** Track 1 **********************@ + +se_m_barrier_1: + .byte KEYSH , se_m_barrier_key+0 + .byte TEMPO , 150*se_m_barrier_tbs/2 + .byte VOICE , 19 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v+3 + .byte N06 , Cn6 , v088 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-8 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-17 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-34 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-45 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v+0 + .byte N06 , Cn6 , v084 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-20 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-37 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-47 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-1 + .byte N06 , Cn6 , v076 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-21 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-48 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-1 + .byte N06 , Cn6 , v064 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-21 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-48 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v056 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-12 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v044 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-12 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v036 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v028 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte W06 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_barrier_2: + .byte KEYSH , se_m_barrier_key+0 + .byte VOICE , 53 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-5 + .byte W02 + .byte N06 , An5 , v064 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v056 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 +se_m_barrier_2_000: + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v052 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte PEND + .byte PATT + .word se_m_barrier_2_000 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v048 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v044 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v040 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v036 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W05 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_barrier: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_barrier_pri @ Priority + .byte se_m_barrier_rev @ Reverb. + + .word se_m_barrier_grp + + .word se_m_barrier_1 + .word se_m_barrier_2 + + .end diff --git a/sound/songs/se_w226.s b/sound/songs/se_m_baton_pass.s similarity index 64% rename from sound/songs/se_w226.s rename to sound/songs/se_m_baton_pass.s index fe6c6d05e8..30027e5b68 100644 --- a/sound/songs/se_w226.s +++ b/sound/songs/se_m_baton_pass.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w226_grp, voicegroup128 - .equ se_w226_pri, 4 - .equ se_w226_rev, reverb_set+50 - .equ se_w226_mvl, 127 - .equ se_w226_key, 0 - .equ se_w226_tbs, 1 - .equ se_w226_exg, 0 - .equ se_w226_cmp, 1 + .equ se_m_baton_pass_grp, voicegroup128 + .equ se_m_baton_pass_pri, 4 + .equ se_m_baton_pass_rev, reverb_set+50 + .equ se_m_baton_pass_mvl, 127 + .equ se_m_baton_pass_key, 0 + .equ se_m_baton_pass_tbs, 1 + .equ se_m_baton_pass_exg, 0 + .equ se_m_baton_pass_cmp, 1 .section .rodata - .global se_w226 + .global se_m_baton_pass .align 2 @********************** Track 1 **********************@ -se_w226_1: - .byte KEYSH , se_w226_key+0 +se_m_baton_pass_1: + .byte KEYSH , se_m_baton_pass_key+0 .byte VOICE , 19 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 12*se_w226_mvl/mxv + .byte VOL , 12*se_m_baton_pass_mvl/mxv .byte BEND , c_v+49 .byte N06 , Gn4 , v080 .byte W01 - .byte VOL , 44*se_w226_mvl/mxv + .byte VOL , 44*se_m_baton_pass_mvl/mxv .byte BEND , c_v+22 .byte W01 - .byte VOL , 62*se_w226_mvl/mxv + .byte VOL , 62*se_m_baton_pass_mvl/mxv .byte PAN , c_v+8 - .byte VOL , 75*se_w226_mvl/mxv + .byte VOL , 75*se_m_baton_pass_mvl/mxv .byte BEND , c_v+20 .byte W01 - .byte VOL , 87*se_w226_mvl/mxv + .byte VOL , 87*se_m_baton_pass_mvl/mxv .byte BEND , c_v+33 .byte W01 - .byte VOL , 96*se_w226_mvl/mxv + .byte VOL , 96*se_m_baton_pass_mvl/mxv .byte PAN , c_v-7 - .byte VOL , 100*se_w226_mvl/mxv + .byte VOL , 100*se_m_baton_pass_mvl/mxv .byte BEND , c_v+54 .byte W01 .byte c_v+63 @@ -51,18 +51,18 @@ se_w226_1: .byte VOICE , 45 .byte MOD , 30 .byte BENDR , 24 - .byte VOL , 54*se_w226_mvl/mxv + .byte VOL , 54*se_m_baton_pass_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn3 , v108 .byte W01 - .byte VOL , 70*se_w226_mvl/mxv + .byte VOL , 70*se_m_baton_pass_mvl/mxv .byte BEND , c_v+4 .byte W01 .byte PAN , c_v+5 - .byte VOL , 80*se_w226_mvl/mxv + .byte VOL , 80*se_m_baton_pass_mvl/mxv .byte BEND , c_v+9 .byte W01 - .byte VOL , 100*se_w226_mvl/mxv + .byte VOL , 100*se_m_baton_pass_mvl/mxv .byte BEND , c_v+16 .byte W01 .byte c_v+24 @@ -123,17 +123,17 @@ se_w226_1: @********************** Track 2 **********************@ -se_w226_2: - .byte KEYSH , se_w226_key+0 +se_m_baton_pass_2: + .byte KEYSH , se_m_baton_pass_key+0 .byte VOICE , 57 - .byte VOL , 59*se_w226_mvl/mxv + .byte VOL , 59*se_m_baton_pass_mvl/mxv .byte N06 , Gs4 , v052 .byte W01 - .byte VOL , 72*se_w226_mvl/mxv + .byte VOL , 72*se_m_baton_pass_mvl/mxv .byte W01 - .byte 90*se_w226_mvl/mxv + .byte 90*se_m_baton_pass_mvl/mxv .byte W01 - .byte 100*se_w226_mvl/mxv + .byte 100*se_m_baton_pass_mvl/mxv .byte W03 .byte W02 .byte N04 , Gs4 , v024 @@ -155,15 +155,15 @@ se_w226_2: @******************************************************@ .align 2 -se_w226: +se_m_baton_pass: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w226_pri @ Priority - .byte se_w226_rev @ Reverb. + .byte se_m_baton_pass_pri @ Priority + .byte se_m_baton_pass_rev @ Reverb. - .word se_w226_grp + .word se_m_baton_pass_grp - .word se_w226_1 - .word se_w226_2 + .word se_m_baton_pass_1 + .word se_m_baton_pass_2 .end diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s new file mode 100644 index 0000000000..919c02b16c --- /dev/null +++ b/sound/songs/se_m_belly_drum.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_belly_drum_grp, voicegroup128 + .equ se_m_belly_drum_pri, 4 + .equ se_m_belly_drum_rev, reverb_set+50 + .equ se_m_belly_drum_mvl, 127 + .equ se_m_belly_drum_key, 0 + .equ se_m_belly_drum_tbs, 1 + .equ se_m_belly_drum_exg, 0 + .equ se_m_belly_drum_cmp, 1 + + .section .rodata + .global se_m_belly_drum + .align 2 + +@********************** Track 1 **********************@ + +se_m_belly_drum_1: + .byte KEYSH , se_m_belly_drum_key+0 + .byte TEMPO , 150*se_m_belly_drum_tbs/2 + .byte VOICE , 6 + .byte BENDR , 12 + .byte VOL , 115*se_m_belly_drum_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N19 , An2 , v127 + .byte W01 + .byte BEND , c_v-6 + .byte W01 + .byte c_v-10 + .byte W01 + .byte c_v-14 + .byte W01 + .byte c_v-12 + .byte W02 + .byte c_v-14 + .byte W01 + .byte c_v-18 + .byte W01 + .byte VOL , 108*se_m_belly_drum_mvl/mxv + .byte BEND , c_v-20 + .byte W01 + .byte c_v-22 + .byte W01 + .byte VOL , 94*se_m_belly_drum_mvl/mxv + .byte W03 + .byte 78*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 62*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 40*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 27*se_m_belly_drum_mvl/mxv + .byte W02 + .byte 12*se_m_belly_drum_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_belly_drum: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_belly_drum_pri @ Priority + .byte se_m_belly_drum_rev @ Reverb. + + .word se_m_belly_drum_grp + + .word se_m_belly_drum_1 + + .end diff --git a/sound/songs/se_w044.s b/sound/songs/se_m_bite.s similarity index 70% rename from sound/songs/se_w044.s rename to sound/songs/se_m_bite.s index ad706d93f1..3c51a8f2ff 100644 --- a/sound/songs/se_w044.s +++ b/sound/songs/se_m_bite.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w044_grp, voicegroup128 - .equ se_w044_pri, 4 - .equ se_w044_rev, reverb_set+50 - .equ se_w044_mvl, 127 - .equ se_w044_key, 0 - .equ se_w044_tbs, 1 - .equ se_w044_exg, 0 - .equ se_w044_cmp, 1 + .equ se_m_bite_grp, voicegroup128 + .equ se_m_bite_pri, 4 + .equ se_m_bite_rev, reverb_set+50 + .equ se_m_bite_mvl, 127 + .equ se_m_bite_key, 0 + .equ se_m_bite_tbs, 1 + .equ se_m_bite_exg, 0 + .equ se_m_bite_cmp, 1 .section .rodata - .global se_w044 + .global se_m_bite .align 2 @********************** Track 1 **********************@ -se_w044_1: - .byte KEYSH , se_w044_key+0 - .byte TEMPO , 220*se_w044_tbs/2 +se_m_bite_1: + .byte KEYSH , se_m_bite_key+0 + .byte TEMPO , 220*se_m_bite_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+6 - .byte VOL , 110*se_w044_mvl/mxv + .byte VOL , 110*se_m_bite_mvl/mxv .byte BEND , c_v+0 .byte N02 , Gn3 , v112 .byte W02 @@ -70,10 +70,10 @@ se_w044_1: @********************** Track 2 **********************@ -se_w044_2: - .byte KEYSH , se_w044_key+0 +se_m_bite_2: + .byte KEYSH , se_m_bite_key+0 .byte VOICE , 27 - .byte VOL , 110*se_w044_mvl/mxv + .byte VOL , 110*se_m_bite_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W10 @@ -86,15 +86,15 @@ se_w044_2: @******************************************************@ .align 2 -se_w044: +se_m_bite: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w044_pri @ Priority - .byte se_w044_rev @ Reverb. + .byte se_m_bite_pri @ Priority + .byte se_m_bite_rev @ Reverb. - .word se_w044_grp + .word se_m_bite_grp - .word se_w044_1 - .word se_w044_2 + .word se_m_bite_1 + .word se_m_bite_2 .end diff --git a/sound/songs/se_w059.s b/sound/songs/se_m_blizzard.s similarity index 62% rename from sound/songs/se_w059.s rename to sound/songs/se_m_blizzard.s index 6b163ef7eb..6bce3c9872 100644 --- a/sound/songs/se_w059.s +++ b/sound/songs/se_m_blizzard.s @@ -1,49 +1,49 @@ .include "MPlayDef.s" - .equ se_w059_grp, voicegroup128 - .equ se_w059_pri, 4 - .equ se_w059_rev, reverb_set+50 - .equ se_w059_mvl, 127 - .equ se_w059_key, 0 - .equ se_w059_tbs, 1 - .equ se_w059_exg, 0 - .equ se_w059_cmp, 1 + .equ se_m_blizzard_grp, voicegroup128 + .equ se_m_blizzard_pri, 4 + .equ se_m_blizzard_rev, reverb_set+50 + .equ se_m_blizzard_mvl, 127 + .equ se_m_blizzard_key, 0 + .equ se_m_blizzard_tbs, 1 + .equ se_m_blizzard_exg, 0 + .equ se_m_blizzard_cmp, 1 .section .rodata - .global se_w059 + .global se_m_blizzard .align 2 @********************** Track 1 **********************@ -se_w059_1: - .byte KEYSH , se_w059_key+0 - .byte TEMPO , 150*se_w059_tbs/2 +se_m_blizzard_1: + .byte KEYSH , se_m_blizzard_key+0 + .byte TEMPO , 150*se_m_blizzard_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 64*se_w059_mvl/mxv + .byte VOL , 64*se_m_blizzard_mvl/mxv .byte BEND , c_v+0 .byte N24 , Gn3 , v108 .byte W03 - .byte VOL , 79*se_w059_mvl/mxv + .byte VOL , 79*se_m_blizzard_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 84*se_w059_mvl/mxv + .byte VOL , 84*se_m_blizzard_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 91*se_w059_mvl/mxv + .byte VOL , 91*se_m_blizzard_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 100*se_w059_mvl/mxv + .byte VOL , 100*se_m_blizzard_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 110*se_w059_mvl/mxv + .byte VOL , 110*se_m_blizzard_mvl/mxv .byte W03 .byte PAN , c_v-12 .byte W06 -se_w059_1_B1: +se_m_blizzard_1_B1: .byte PAN , c_v-17 .byte BEND , c_v+0 .byte N48 , Gn3 , v108 @@ -84,20 +84,20 @@ se_w059_1_B1: .byte PAN , c_v-11 .byte W03 .byte GOTO - .word se_w059_1_B1 + .word se_m_blizzard_1_B1 .byte FINE @******************************************************@ .align 2 -se_w059: +se_m_blizzard: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w059_pri @ Priority - .byte se_w059_rev @ Reverb. + .byte se_m_blizzard_pri @ Priority + .byte se_m_blizzard_rev @ Reverb. - .word se_w059_grp + .word se_m_blizzard_grp - .word se_w059_1 + .word se_m_blizzard_1 .end diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s new file mode 100644 index 0000000000..8c1518e637 --- /dev/null +++ b/sound/songs/se_m_blizzard2.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_blizzard2_grp, voicegroup128 + .equ se_m_blizzard2_pri, 4 + .equ se_m_blizzard2_rev, reverb_set+50 + .equ se_m_blizzard2_mvl, 127 + .equ se_m_blizzard2_key, 0 + .equ se_m_blizzard2_tbs, 1 + .equ se_m_blizzard2_exg, 0 + .equ se_m_blizzard2_cmp, 1 + + .section .rodata + .global se_m_blizzard2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_blizzard2_1: + .byte KEYSH , se_m_blizzard2_key+0 + .byte TEMPO , 150*se_m_blizzard2_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_blizzard2_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Gn3 , v108 + .byte W02 + .byte PAN , c_v-19 + .byte W04 + .byte c_v+0 + .byte W01 + .byte VOL , 97*se_m_blizzard2_mvl/mxv + .byte W01 + .byte PAN , c_v+16 + .byte W01 + .byte VOL , 84*se_m_blizzard2_mvl/mxv + .byte W03 + .byte 76*se_m_blizzard2_mvl/mxv + .byte PAN , c_v+2 + .byte W02 + .byte VOL , 55*se_m_blizzard2_mvl/mxv + .byte PAN , c_v-8 + .byte W02 + .byte VOL , 39*se_m_blizzard2_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 25*se_m_blizzard2_mvl/mxv + .byte W01 + .byte PAN , c_v+8 + .byte W01 + .byte VOL , 13*se_m_blizzard2_mvl/mxv + .byte W03 + .byte 7*se_m_blizzard2_mvl/mxv + .byte PAN , c_v+0 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_blizzard2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_blizzard2_pri @ Priority + .byte se_m_blizzard2_rev @ Reverb. + + .word se_m_blizzard2_grp + + .word se_m_blizzard2_1 + + .end diff --git a/sound/songs/se_w155.s b/sound/songs/se_m_bonemerang.s similarity index 51% rename from sound/songs/se_w155.s rename to sound/songs/se_m_bonemerang.s index 29508b6081..11f035347e 100644 --- a/sound/songs/se_w155.s +++ b/sound/songs/se_m_bonemerang.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w155_grp, voicegroup128 - .equ se_w155_pri, 4 - .equ se_w155_rev, reverb_set+50 - .equ se_w155_mvl, 127 - .equ se_w155_key, 0 - .equ se_w155_tbs, 1 - .equ se_w155_exg, 0 - .equ se_w155_cmp, 1 + .equ se_m_bonemerang_grp, voicegroup128 + .equ se_m_bonemerang_pri, 4 + .equ se_m_bonemerang_rev, reverb_set+50 + .equ se_m_bonemerang_mvl, 127 + .equ se_m_bonemerang_key, 0 + .equ se_m_bonemerang_tbs, 1 + .equ se_m_bonemerang_exg, 0 + .equ se_m_bonemerang_cmp, 1 .section .rodata - .global se_w155 + .global se_m_bonemerang .align 2 @********************** Track 1 **********************@ -se_w155_1: - .byte KEYSH , se_w155_key+0 - .byte TEMPO , 150*se_w155_tbs/2 +se_m_bonemerang_1: + .byte KEYSH , se_m_bonemerang_key+0 + .byte TEMPO , 150*se_m_bonemerang_tbs/2 .byte VOICE , 24 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w155_mvl/mxv + .byte VOL , 110*se_m_bonemerang_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn5 , v127 .byte W01 @@ -44,14 +44,14 @@ se_w155_1: @******************************************************@ .align 2 -se_w155: +se_m_bonemerang: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w155_pri @ Priority - .byte se_w155_rev @ Reverb. + .byte se_m_bonemerang_pri @ Priority + .byte se_m_bonemerang_rev @ Reverb. - .word se_w155_grp + .word se_m_bonemerang_grp - .word se_w155_1 + .word se_m_bonemerang_1 .end diff --git a/sound/songs/se_w280.s b/sound/songs/se_m_brick_break.s similarity index 64% rename from sound/songs/se_w280.s rename to sound/songs/se_m_brick_break.s index 19d383176b..08058089f0 100644 --- a/sound/songs/se_w280.s +++ b/sound/songs/se_m_brick_break.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w280_grp, voicegroup128 - .equ se_w280_pri, 4 - .equ se_w280_rev, reverb_set+50 - .equ se_w280_mvl, 127 - .equ se_w280_key, 0 - .equ se_w280_tbs, 1 - .equ se_w280_exg, 0 - .equ se_w280_cmp, 1 + .equ se_m_brick_break_grp, voicegroup128 + .equ se_m_brick_break_pri, 4 + .equ se_m_brick_break_rev, reverb_set+50 + .equ se_m_brick_break_mvl, 127 + .equ se_m_brick_break_key, 0 + .equ se_m_brick_break_tbs, 1 + .equ se_m_brick_break_exg, 0 + .equ se_m_brick_break_cmp, 1 .section .rodata - .global se_w280 + .global se_m_brick_break .align 2 @********************** Track 1 **********************@ -se_w280_1: - .byte KEYSH , se_w280_key+0 - .byte TEMPO , 150*se_w280_tbs/2 +se_m_brick_break_1: + .byte KEYSH , se_m_brick_break_key+0 + .byte TEMPO , 150*se_m_brick_break_tbs/2 .byte VOICE , 41 - .byte VOL , 110*se_w280_mvl/mxv + .byte VOL , 110*se_m_brick_break_mvl/mxv .byte PAN , c_v+0 .byte N01 , Cn4 , v127 .byte W01 @@ -56,10 +56,10 @@ se_w280_1: @********************** Track 2 **********************@ -se_w280_2: - .byte KEYSH , se_w280_key+0 +se_m_brick_break_2: + .byte KEYSH , se_m_brick_break_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w280_mvl/mxv + .byte VOL , 110*se_m_brick_break_mvl/mxv .byte PAN , c_v+0 .byte N01 , Cn3 , v064 .byte W01 @@ -86,15 +86,15 @@ se_w280_2: @******************************************************@ .align 2 -se_w280: +se_m_brick_break: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w280_pri @ Priority - .byte se_w280_rev @ Reverb. + .byte se_m_brick_break_pri @ Priority + .byte se_m_brick_break_rev @ Reverb. - .word se_w280_grp + .word se_m_brick_break_grp - .word se_w280_1 - .word se_w280_2 + .word se_m_brick_break_1 + .word se_m_brick_break_2 .end diff --git a/sound/songs/se_w145.s b/sound/songs/se_m_bubble.s similarity index 55% rename from sound/songs/se_w145.s rename to sound/songs/se_m_bubble.s index bb7d87a2d5..ee31a176b1 100644 --- a/sound/songs/se_w145.s +++ b/sound/songs/se_m_bubble.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w145_grp, voicegroup128 - .equ se_w145_pri, 4 - .equ se_w145_rev, reverb_set+50 - .equ se_w145_mvl, 127 - .equ se_w145_key, 0 - .equ se_w145_tbs, 1 - .equ se_w145_exg, 0 - .equ se_w145_cmp, 1 + .equ se_m_bubble_grp, voicegroup128 + .equ se_m_bubble_pri, 4 + .equ se_m_bubble_rev, reverb_set+50 + .equ se_m_bubble_mvl, 127 + .equ se_m_bubble_key, 0 + .equ se_m_bubble_tbs, 1 + .equ se_m_bubble_exg, 0 + .equ se_m_bubble_cmp, 1 .section .rodata - .global se_w145 + .global se_m_bubble .align 2 @********************** Track 1 **********************@ -se_w145_1: - .byte KEYSH , se_w145_key+0 - .byte TEMPO , 220*se_w145_tbs/2 +se_m_bubble_1: + .byte KEYSH , se_m_bubble_key+0 + .byte TEMPO , 220*se_m_bubble_tbs/2 .byte VOICE , 23 - .byte VOL , 95*se_w145_mvl/mxv + .byte VOL , 95*se_m_bubble_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -44,14 +44,14 @@ se_w145_1: @******************************************************@ .align 2 -se_w145: +se_m_bubble: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w145_pri @ Priority - .byte se_w145_rev @ Reverb. + .byte se_m_bubble_pri @ Priority + .byte se_m_bubble_rev @ Reverb. - .word se_w145_grp + .word se_m_bubble_grp - .word se_w145_1 + .word se_m_bubble_1 .end diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s new file mode 100644 index 0000000000..97e7cbbf85 --- /dev/null +++ b/sound/songs/se_m_bubble2.s @@ -0,0 +1,60 @@ + .include "MPlayDef.s" + + .equ se_m_bubble2_grp, voicegroup128 + .equ se_m_bubble2_pri, 4 + .equ se_m_bubble2_rev, reverb_set+50 + .equ se_m_bubble2_mvl, 127 + .equ se_m_bubble2_key, 0 + .equ se_m_bubble2_tbs, 1 + .equ se_m_bubble2_exg, 0 + .equ se_m_bubble2_cmp, 1 + + .section .rodata + .global se_m_bubble2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_bubble2_1: + .byte KEYSH , se_m_bubble2_key+0 + .byte TEMPO , 220*se_m_bubble2_tbs/2 + .byte VOICE , 24 + .byte VOL , 110*se_m_bubble2_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte W03 + .byte N09 , Gn4 , v127 + .byte W02 + .byte BEND , c_v+31 + .byte W02 + .byte c_v-34 + .byte W17 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_bubble2_2: + .byte KEYSH , se_m_bubble2_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_bubble2_mvl/mxv + .byte PAN , c_v+0 + .byte N01 , Cn4 , v044 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_bubble2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_bubble2_pri @ Priority + .byte se_m_bubble2_rev @ Reverb. + + .word se_m_bubble2_grp + + .word se_m_bubble2_1 + .word se_m_bubble2_2 + + .end diff --git a/sound/songs/se_w145c.s b/sound/songs/se_m_bubble3.s similarity index 57% rename from sound/songs/se_w145c.s rename to sound/songs/se_m_bubble3.s index 61bf7fa0d7..c14badb5a9 100644 --- a/sound/songs/se_w145c.s +++ b/sound/songs/se_m_bubble3.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w145c_grp, voicegroup128 - .equ se_w145c_pri, 4 - .equ se_w145c_rev, reverb_set+50 - .equ se_w145c_mvl, 127 - .equ se_w145c_key, 0 - .equ se_w145c_tbs, 1 - .equ se_w145c_exg, 0 - .equ se_w145c_cmp, 1 + .equ se_m_bubble3_grp, voicegroup128 + .equ se_m_bubble3_pri, 4 + .equ se_m_bubble3_rev, reverb_set+50 + .equ se_m_bubble3_mvl, 127 + .equ se_m_bubble3_key, 0 + .equ se_m_bubble3_tbs, 1 + .equ se_m_bubble3_exg, 0 + .equ se_m_bubble3_cmp, 1 .section .rodata - .global se_w145c + .global se_m_bubble3 .align 2 @********************** Track 1 **********************@ -se_w145c_1: - .byte KEYSH , se_w145c_key+0 - .byte TEMPO , 220*se_w145c_tbs/2 +se_m_bubble3_1: + .byte KEYSH , se_m_bubble3_key+0 + .byte TEMPO , 220*se_m_bubble3_tbs/2 .byte VOICE , 23 - .byte VOL , 95*se_w145c_mvl/mxv + .byte VOL , 95*se_m_bubble3_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -49,14 +49,14 @@ se_w145c_1: @******************************************************@ .align 2 -se_w145c: +se_m_bubble3: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w145c_pri @ Priority - .byte se_w145c_rev @ Reverb. + .byte se_m_bubble3_pri @ Priority + .byte se_m_bubble3_rev @ Reverb. - .word se_w145c_grp + .word se_m_bubble3_grp - .word se_w145c_1 + .word se_m_bubble3_1 .end diff --git a/sound/songs/se_w062.s b/sound/songs/se_m_bubble_beam.s similarity index 62% rename from sound/songs/se_w062.s rename to sound/songs/se_m_bubble_beam.s index 58de81e574..621882b03f 100644 --- a/sound/songs/se_w062.s +++ b/sound/songs/se_m_bubble_beam.s @@ -1,56 +1,56 @@ .include "MPlayDef.s" - .equ se_w062_grp, voicegroup128 - .equ se_w062_pri, 4 - .equ se_w062_rev, reverb_set+50 - .equ se_w062_mvl, 127 - .equ se_w062_key, 0 - .equ se_w062_tbs, 1 - .equ se_w062_exg, 0 - .equ se_w062_cmp, 1 + .equ se_m_bubble_beam_grp, voicegroup128 + .equ se_m_bubble_beam_pri, 4 + .equ se_m_bubble_beam_rev, reverb_set+50 + .equ se_m_bubble_beam_mvl, 127 + .equ se_m_bubble_beam_key, 0 + .equ se_m_bubble_beam_tbs, 1 + .equ se_m_bubble_beam_exg, 0 + .equ se_m_bubble_beam_cmp, 1 .section .rodata - .global se_w062 + .global se_m_bubble_beam .align 2 @********************** Track 1 **********************@ -se_w062_1: - .byte KEYSH , se_w062_key+0 - .byte TEMPO , 150*se_w062_tbs/2 +se_m_bubble_beam_1: + .byte KEYSH , se_m_bubble_beam_key+0 + .byte TEMPO , 150*se_m_bubble_beam_tbs/2 .byte VOICE , 9 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 24*se_w062_mvl/mxv + .byte VOL , 24*se_m_bubble_beam_mvl/mxv .byte BEND , c_v-17 .byte N78 , Bn4 , v080 .byte W01 - .byte VOL , 32*se_w062_mvl/mxv + .byte VOL , 32*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 38*se_w062_mvl/mxv + .byte VOL , 38*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-7 .byte W01 - .byte VOL , 48*se_w062_mvl/mxv + .byte VOL , 48*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+9 .byte W01 - .byte VOL , 66*se_w062_mvl/mxv + .byte VOL , 66*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-13 .byte W02 - .byte VOL , 78*se_w062_mvl/mxv + .byte VOL , 78*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 94*se_w062_mvl/mxv + .byte VOL , 94*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-6 .byte W01 - .byte VOL , 110*se_w062_mvl/mxv + .byte VOL , 110*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+6 .byte W01 .byte c_v-7 .byte W02 -se_w062_1_000: +se_m_bubble_beam_1_000: .byte PAN , c_v+9 .byte W01 .byte c_v-13 @@ -62,7 +62,7 @@ se_w062_1_000: .byte c_v+0 .byte W02 .byte PEND -se_w062_1_001: +se_m_bubble_beam_1_001: .byte PAN , c_v+6 .byte W01 .byte c_v-7 @@ -125,34 +125,34 @@ se_w062_1_001: .byte c_v-7 .byte W02 .byte PATT - .word se_w062_1_000 + .word se_m_bubble_beam_1_000 .byte PATT - .word se_w062_1_001 + .word se_m_bubble_beam_1_001 .byte PAN , c_v-6 .byte W01 .byte c_v+0 .byte W01 .byte c_v+6 .byte W01 - .byte VOL , 103*se_w062_mvl/mxv + .byte VOL , 103*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-7 .byte W01 - .byte VOL , 91*se_w062_mvl/mxv + .byte VOL , 91*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+9 .byte W02 - .byte VOL , 72*se_w062_mvl/mxv + .byte VOL , 72*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-13 .byte W01 - .byte VOL , 58*se_w062_mvl/mxv + .byte VOL , 58*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 38*se_w062_mvl/mxv + .byte VOL , 38*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-6 .byte W01 - .byte VOL , 15*se_w062_mvl/mxv + .byte VOL , 15*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 7*se_w062_mvl/mxv + .byte VOL , 7*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W02 .byte FINE @@ -160,14 +160,14 @@ se_w062_1_001: @******************************************************@ .align 2 -se_w062: +se_m_bubble_beam: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w062_pri @ Priority - .byte se_w062_rev @ Reverb. + .byte se_m_bubble_beam_pri @ Priority + .byte se_m_bubble_beam_rev @ Reverb. - .word se_w062_grp + .word se_m_bubble_beam_grp - .word se_w062_1 + .word se_m_bubble_beam_1 .end diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s new file mode 100644 index 0000000000..0e8cbf5e41 --- /dev/null +++ b/sound/songs/se_m_bubble_beam2.s @@ -0,0 +1,131 @@ + .include "MPlayDef.s" + + .equ se_m_bubble_beam2_grp, voicegroup128 + .equ se_m_bubble_beam2_pri, 4 + .equ se_m_bubble_beam2_rev, reverb_set+50 + .equ se_m_bubble_beam2_mvl, 127 + .equ se_m_bubble_beam2_key, 0 + .equ se_m_bubble_beam2_tbs, 1 + .equ se_m_bubble_beam2_exg, 0 + .equ se_m_bubble_beam2_cmp, 1 + + .section .rodata + .global se_m_bubble_beam2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_bubble_beam2_1: + .byte KEYSH , se_m_bubble_beam2_key+0 + .byte TEMPO , 150*se_m_bubble_beam2_tbs/2 + .byte VOICE , 9 + .byte BENDR , 2 + .byte PAN , c_v+0 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-23 + .byte N09 , Dn5 , v127 + .byte W01 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W01 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W02 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W01 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W01 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W02 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-23 + .byte N09 , Dn5 , v100 + .byte W02 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W01 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W02 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W01 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W02 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-23 + .byte N09 , Dn5 , v080 + .byte W01 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W02 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W01 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W02 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_bubble_beam2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_bubble_beam2_pri @ Priority + .byte se_m_bubble_beam2_rev @ Reverb. + + .word se_m_bubble_beam2_grp + + .word se_m_bubble_beam2_1 + + .end diff --git a/sound/songs/se_w268.s b/sound/songs/se_m_charge.s similarity index 71% rename from sound/songs/se_w268.s rename to sound/songs/se_m_charge.s index c2c9ee9f7a..47d70a4bff 100644 --- a/sound/songs/se_w268.s +++ b/sound/songs/se_m_charge.s @@ -1,56 +1,56 @@ .include "MPlayDef.s" - .equ se_w268_grp, voicegroup128 - .equ se_w268_pri, 4 - .equ se_w268_rev, reverb_set+50 - .equ se_w268_mvl, 127 - .equ se_w268_key, 0 - .equ se_w268_tbs, 1 - .equ se_w268_exg, 0 - .equ se_w268_cmp, 1 + .equ se_m_charge_grp, voicegroup128 + .equ se_m_charge_pri, 4 + .equ se_m_charge_rev, reverb_set+50 + .equ se_m_charge_mvl, 127 + .equ se_m_charge_key, 0 + .equ se_m_charge_tbs, 1 + .equ se_m_charge_exg, 0 + .equ se_m_charge_cmp, 1 .section .rodata - .global se_w268 + .global se_m_charge .align 2 @********************** Track 1 **********************@ -se_w268_1: - .byte KEYSH , se_w268_key+0 - .byte TEMPO , 150*se_w268_tbs/2 +se_m_charge_1: + .byte KEYSH , se_m_charge_key+0 + .byte TEMPO , 150*se_m_charge_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 34*se_w268_mvl/mxv + .byte VOL , 34*se_m_charge_mvl/mxv .byte BEND , c_v+0 .byte N66 , Cn5 , v127 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 43*se_w268_mvl/mxv + .byte VOL , 43*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte BEND , c_v-2 .byte W01 - .byte VOL , 58*se_w268_mvl/mxv + .byte VOL , 58*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W02 .byte c_v-2 .byte W01 - .byte VOL , 70*se_w268_mvl/mxv + .byte VOL , 70*se_m_charge_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v-4 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 76*se_w268_mvl/mxv + .byte VOL , 76*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte BEND , c_v-6 .byte W02 - .byte VOL , 90*se_w268_mvl/mxv + .byte VOL , 90*se_m_charge_mvl/mxv .byte PAN , c_v+4 .byte W01 .byte c_v+2 @@ -118,14 +118,14 @@ se_w268_1: .byte W01 .byte PAN , c_v+2 .byte W01 - .byte VOL , 84*se_w268_mvl/mxv + .byte VOL , 84*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+0 .byte W02 .byte c_v-2 .byte W01 - .byte VOL , 78*se_w268_mvl/mxv + .byte VOL , 78*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 @@ -133,39 +133,39 @@ se_w268_1: .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 70*se_w268_mvl/mxv + .byte VOL , 70*se_m_charge_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v-4 .byte W01 - .byte VOL , 55*se_w268_mvl/mxv + .byte VOL , 55*se_m_charge_mvl/mxv .byte PAN , c_v-2 .byte BEND , c_v-29 .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 46*se_w268_mvl/mxv + .byte VOL , 46*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W01 .byte c_v+4 .byte BEND , c_v-31 .byte W02 - .byte VOL , 36*se_w268_mvl/mxv + .byte VOL , 36*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W01 .byte c_v+0 .byte W01 - .byte VOL , 24*se_w268_mvl/mxv + .byte VOL , 24*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-36 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 13*se_w268_mvl/mxv + .byte VOL , 13*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-42 .byte W02 - .byte VOL , 5*se_w268_mvl/mxv + .byte VOL , 5*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W06 .byte FINE @@ -173,14 +173,14 @@ se_w268_1: @******************************************************@ .align 2 -se_w268: +se_m_charge: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w268_pri @ Priority - .byte se_w268_rev @ Reverb. + .byte se_m_charge_pri @ Priority + .byte se_m_charge_rev @ Reverb. - .word se_w268_grp + .word se_m_charge_grp - .word se_w268_1 + .word se_m_charge_1 .end diff --git a/sound/songs/se_w204.s b/sound/songs/se_m_charm.s similarity index 55% rename from sound/songs/se_w204.s rename to sound/songs/se_m_charm.s index 1e66392aca..ef10cb3e3f 100644 --- a/sound/songs/se_w204.s +++ b/sound/songs/se_m_charm.s @@ -1,52 +1,52 @@ .include "MPlayDef.s" - .equ se_w204_grp, voicegroup128 - .equ se_w204_pri, 4 - .equ se_w204_rev, reverb_set+50 - .equ se_w204_mvl, 127 - .equ se_w204_key, 0 - .equ se_w204_tbs, 1 - .equ se_w204_exg, 0 - .equ se_w204_cmp, 1 + .equ se_m_charm_grp, voicegroup128 + .equ se_m_charm_pri, 4 + .equ se_m_charm_rev, reverb_set+50 + .equ se_m_charm_mvl, 127 + .equ se_m_charm_key, 0 + .equ se_m_charm_tbs, 1 + .equ se_m_charm_exg, 0 + .equ se_m_charm_cmp, 1 .section .rodata - .global se_w204 + .global se_m_charm .align 2 @********************** Track 1 **********************@ -se_w204_1: - .byte KEYSH , se_w204_key+0 - .byte TEMPO , 150*se_w204_tbs/2 +se_m_charm_1: + .byte KEYSH , se_m_charm_key+0 + .byte TEMPO , 150*se_m_charm_tbs/2 .byte VOICE , 37 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 25*se_w204_mvl/mxv + .byte VOL , 25*se_m_charm_mvl/mxv .byte BEND , c_v+11 .byte N02 , Fn4 , v127 .byte W01 - .byte VOL , 42*se_w204_mvl/mxv + .byte VOL , 42*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+5 .byte W01 - .byte VOL , 62*se_w204_mvl/mxv + .byte VOL , 62*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+0 .byte N15 .byte W01 - .byte VOL , 77*se_w204_mvl/mxv + .byte VOL , 77*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+5 .byte W01 - .byte VOL , 84*se_w204_mvl/mxv + .byte VOL , 84*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+12 .byte W02 - .byte VOL , 96*se_w204_mvl/mxv + .byte VOL , 96*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+20 .byte W01 - .byte VOL , 100*se_w204_mvl/mxv + .byte VOL , 100*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+25 .byte W01 @@ -59,22 +59,22 @@ se_w204_1: .byte PAN , c_v+0 .byte BEND , c_v+40 .byte W02 - .byte VOL , 94*se_w204_mvl/mxv + .byte VOL , 94*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w204_mvl/mxv + .byte VOL , 85*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+37 .byte W01 - .byte VOL , 66*se_w204_mvl/mxv + .byte VOL , 66*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+36 .byte W01 - .byte VOL , 49*se_w204_mvl/mxv + .byte VOL , 49*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+34 .byte W01 - .byte VOL , 32*se_w204_mvl/mxv + .byte VOL , 32*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+32 .byte W02 @@ -83,14 +83,14 @@ se_w204_1: @******************************************************@ .align 2 -se_w204: +se_m_charm: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w204_pri @ Priority - .byte se_w204_rev @ Reverb. + .byte se_m_charm_pri @ Priority + .byte se_m_charm_rev @ Reverb. - .word se_w204_grp + .word se_m_charm_grp - .word se_w204_1 + .word se_m_charm_1 .end diff --git a/sound/songs/se_w109.s b/sound/songs/se_m_confuse_ray.s similarity index 74% rename from sound/songs/se_w109.s rename to sound/songs/se_m_confuse_ray.s index 1f43988eb9..12aea8ab8d 100644 --- a/sound/songs/se_w109.s +++ b/sound/songs/se_m_confuse_ray.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w109_grp, voicegroup128 - .equ se_w109_pri, 4 - .equ se_w109_rev, reverb_set+50 - .equ se_w109_mvl, 127 - .equ se_w109_key, 0 - .equ se_w109_tbs, 1 - .equ se_w109_exg, 0 - .equ se_w109_cmp, 1 + .equ se_m_confuse_ray_grp, voicegroup128 + .equ se_m_confuse_ray_pri, 4 + .equ se_m_confuse_ray_rev, reverb_set+50 + .equ se_m_confuse_ray_mvl, 127 + .equ se_m_confuse_ray_key, 0 + .equ se_m_confuse_ray_tbs, 1 + .equ se_m_confuse_ray_exg, 0 + .equ se_m_confuse_ray_cmp, 1 .section .rodata - .global se_w109 + .global se_m_confuse_ray .align 2 @********************** Track 1 **********************@ -se_w109_1: - .byte KEYSH , se_w109_key+0 - .byte TEMPO , 220*se_w109_tbs/2 +se_m_confuse_ray_1: + .byte KEYSH , se_m_confuse_ray_key+0 + .byte TEMPO , 220*se_m_confuse_ray_tbs/2 .byte VOICE , 52 - .byte VOL , 127*se_w109_mvl/mxv + .byte VOL , 127*se_m_confuse_ray_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -104,14 +104,14 @@ se_w109_1: @******************************************************@ .align 2 -se_w109: +se_m_confuse_ray: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w109_pri @ Priority - .byte se_w109_rev @ Reverb. + .byte se_m_confuse_ray_pri @ Priority + .byte se_m_confuse_ray_rev @ Reverb. - .word se_w109_grp + .word se_m_confuse_ray_grp - .word se_w109_1 + .word se_m_confuse_ray_1 .end diff --git a/sound/songs/se_w322.s b/sound/songs/se_m_cosmic_power.s similarity index 80% rename from sound/songs/se_w322.s rename to sound/songs/se_m_cosmic_power.s index 2f48ff9688..76812478b3 100644 --- a/sound/songs/se_w322.s +++ b/sound/songs/se_m_cosmic_power.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w322_grp, voicegroup128 - .equ se_w322_pri, 4 - .equ se_w322_rev, reverb_set+50 - .equ se_w322_mvl, 127 - .equ se_w322_key, 0 - .equ se_w322_tbs, 1 - .equ se_w322_exg, 0 - .equ se_w322_cmp, 1 + .equ se_m_cosmic_power_grp, voicegroup128 + .equ se_m_cosmic_power_pri, 4 + .equ se_m_cosmic_power_rev, reverb_set+50 + .equ se_m_cosmic_power_mvl, 127 + .equ se_m_cosmic_power_key, 0 + .equ se_m_cosmic_power_tbs, 1 + .equ se_m_cosmic_power_exg, 0 + .equ se_m_cosmic_power_cmp, 1 .section .rodata - .global se_w322 + .global se_m_cosmic_power .align 2 @********************** Track 1 **********************@ -se_w322_1: - .byte KEYSH , se_w322_key+0 - .byte TEMPO , 150*se_w322_tbs/2 +se_m_cosmic_power_1: + .byte KEYSH , se_m_cosmic_power_key+0 + .byte TEMPO , 150*se_m_cosmic_power_tbs/2 .byte VOICE , 46 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w322_mvl/mxv + .byte VOL , 110*se_m_cosmic_power_mvl/mxv .byte BEND , c_v-4 .byte N09 , As5 , v112 .byte W06 @@ -117,12 +117,12 @@ se_w322_1: @********************** Track 2 **********************@ -se_w322_2: - .byte KEYSH , se_w322_key+0 +se_m_cosmic_power_2: + .byte KEYSH , se_m_cosmic_power_key+0 .byte VOICE , 53 .byte XCMD , xIECV , 9 .byte xIECL , 8 - .byte VOL , 43*se_w322_mvl/mxv + .byte VOL , 43*se_m_cosmic_power_mvl/mxv .byte BEND , c_v-2 .byte W04 .byte N08 , Fn5 , v112 @@ -194,15 +194,15 @@ se_w322_2: @******************************************************@ .align 2 -se_w322: +se_m_cosmic_power: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w322_pri @ Priority - .byte se_w322_rev @ Reverb. + .byte se_m_cosmic_power_pri @ Priority + .byte se_m_cosmic_power_rev @ Reverb. - .word se_w322_grp + .word se_m_cosmic_power_grp - .word se_w322_1 - .word se_w322_2 + .word se_m_cosmic_power_1 + .word se_m_cosmic_power_2 .end diff --git a/sound/songs/se_w152.s b/sound/songs/se_m_crabhammer.s similarity index 53% rename from sound/songs/se_w152.s rename to sound/songs/se_m_crabhammer.s index dc03fe76c7..6333150dc7 100644 --- a/sound/songs/se_w152.s +++ b/sound/songs/se_m_crabhammer.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w152_grp, voicegroup128 - .equ se_w152_pri, 4 - .equ se_w152_rev, reverb_set+50 - .equ se_w152_mvl, 127 - .equ se_w152_key, 0 - .equ se_w152_tbs, 1 - .equ se_w152_exg, 0 - .equ se_w152_cmp, 1 + .equ se_m_crabhammer_grp, voicegroup128 + .equ se_m_crabhammer_pri, 4 + .equ se_m_crabhammer_rev, reverb_set+50 + .equ se_m_crabhammer_mvl, 127 + .equ se_m_crabhammer_key, 0 + .equ se_m_crabhammer_tbs, 1 + .equ se_m_crabhammer_exg, 0 + .equ se_m_crabhammer_cmp, 1 .section .rodata - .global se_w152 + .global se_m_crabhammer .align 2 @********************** Track 1 **********************@ -se_w152_1: - .byte KEYSH , se_w152_key+0 - .byte TEMPO , 150*se_w152_tbs/2 +se_m_crabhammer_1: + .byte KEYSH , se_m_crabhammer_key+0 + .byte TEMPO , 150*se_m_crabhammer_tbs/2 .byte VOICE , 23 - .byte VOL , 100*se_w152_mvl/mxv + .byte VOL , 100*se_m_crabhammer_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+2 @@ -45,14 +45,14 @@ se_w152_1: @******************************************************@ .align 2 -se_w152: +se_m_crabhammer: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w152_pri @ Priority - .byte se_w152_rev @ Reverb. + .byte se_m_crabhammer_pri @ Priority + .byte se_m_crabhammer_rev @ Reverb. - .word se_w152_grp + .word se_m_crabhammer_grp - .word se_w152_1 + .word se_m_crabhammer_1 .end diff --git a/sound/songs/se_w197.s b/sound/songs/se_m_detect.s similarity index 71% rename from sound/songs/se_w197.s rename to sound/songs/se_m_detect.s index 619b81b40a..181fb4079a 100644 --- a/sound/songs/se_w197.s +++ b/sound/songs/se_m_detect.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w197_grp, voicegroup128 - .equ se_w197_pri, 4 - .equ se_w197_rev, reverb_set+50 - .equ se_w197_mvl, 127 - .equ se_w197_key, 0 - .equ se_w197_tbs, 1 - .equ se_w197_exg, 0 - .equ se_w197_cmp, 1 + .equ se_m_detect_grp, voicegroup128 + .equ se_m_detect_pri, 4 + .equ se_m_detect_rev, reverb_set+50 + .equ se_m_detect_mvl, 127 + .equ se_m_detect_key, 0 + .equ se_m_detect_tbs, 1 + .equ se_m_detect_exg, 0 + .equ se_m_detect_cmp, 1 .section .rodata - .global se_w197 + .global se_m_detect .align 2 @********************** Track 1 **********************@ -se_w197_1: - .byte KEYSH , se_w197_key+0 - .byte TEMPO , 220*se_w197_tbs/2 +se_m_detect_1: + .byte KEYSH , se_m_detect_key+0 + .byte TEMPO , 220*se_m_detect_tbs/2 .byte VOICE , 54 - .byte VOL , 100*se_w197_mvl/mxv + .byte VOL , 100*se_m_detect_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+1 @@ -82,14 +82,14 @@ se_w197_1: @******************************************************@ .align 2 -se_w197: +se_m_detect: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w197_pri @ Priority - .byte se_w197_rev @ Reverb. + .byte se_m_detect_pri @ Priority + .byte se_m_detect_rev @ Reverb. - .word se_w197_grp + .word se_m_detect_grp - .word se_w197_1 + .word se_m_detect_1 .end diff --git a/sound/songs/se_w091.s b/sound/songs/se_m_dig.s similarity index 63% rename from sound/songs/se_w091.s rename to sound/songs/se_m_dig.s index 953edf4299..42fed8ab56 100644 --- a/sound/songs/se_w091.s +++ b/sound/songs/se_m_dig.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w091_grp, voicegroup128 - .equ se_w091_pri, 4 - .equ se_w091_rev, reverb_set+50 - .equ se_w091_mvl, 127 - .equ se_w091_key, 0 - .equ se_w091_tbs, 1 - .equ se_w091_exg, 0 - .equ se_w091_cmp, 1 + .equ se_m_dig_grp, voicegroup128 + .equ se_m_dig_pri, 4 + .equ se_m_dig_rev, reverb_set+50 + .equ se_m_dig_mvl, 127 + .equ se_m_dig_key, 0 + .equ se_m_dig_tbs, 1 + .equ se_m_dig_exg, 0 + .equ se_m_dig_cmp, 1 .section .rodata - .global se_w091 + .global se_m_dig .align 2 @********************** Track 1 **********************@ -se_w091_1: - .byte KEYSH , se_w091_key+0 - .byte TEMPO , 150*se_w091_tbs/2 +se_m_dig_1: + .byte KEYSH , se_m_dig_key+0 + .byte TEMPO , 150*se_m_dig_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w091_mvl/mxv + .byte VOL , 115*se_m_dig_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn2 , v112 .byte W01 @@ -53,14 +53,14 @@ se_w091_1: @******************************************************@ .align 2 -se_w091: +se_m_dig: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w091_pri @ Priority - .byte se_w091_rev @ Reverb. + .byte se_m_dig_pri @ Priority + .byte se_m_dig_rev @ Reverb. - .word se_w091_grp + .word se_m_dig_grp - .word se_w091_1 + .word se_m_dig_1 .end diff --git a/sound/songs/se_w291.s b/sound/songs/se_m_dive.s similarity index 64% rename from sound/songs/se_w291.s rename to sound/songs/se_m_dive.s index ae8d111340..2313667fcb 100644 --- a/sound/songs/se_w291.s +++ b/sound/songs/se_m_dive.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w291_grp, voicegroup128 - .equ se_w291_pri, 4 - .equ se_w291_rev, reverb_set+50 - .equ se_w291_mvl, 127 - .equ se_w291_key, 0 - .equ se_w291_tbs, 1 - .equ se_w291_exg, 0 - .equ se_w291_cmp, 1 + .equ se_m_dive_grp, voicegroup128 + .equ se_m_dive_pri, 4 + .equ se_m_dive_rev, reverb_set+50 + .equ se_m_dive_mvl, 127 + .equ se_m_dive_key, 0 + .equ se_m_dive_tbs, 1 + .equ se_m_dive_exg, 0 + .equ se_m_dive_cmp, 1 .section .rodata - .global se_w291 + .global se_m_dive .align 2 @********************** Track 1 **********************@ -se_w291_1: - .byte KEYSH , se_w291_key+0 - .byte TEMPO , 150*se_w291_tbs/2 +se_m_dive_1: + .byte KEYSH , se_m_dive_key+0 + .byte TEMPO , 150*se_m_dive_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 105*se_w291_mvl/mxv + .byte VOL , 105*se_m_dive_mvl/mxv .byte BEND , c_v-18 .byte N06 , Fn2 , v127 .byte W03 @@ -43,39 +43,39 @@ se_w291_1: .byte PAN , c_v-3 .byte BEND , c_v-5 .byte W02 - .byte VOL , 100*se_w291_mvl/mxv + .byte VOL , 100*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte BEND , c_v-2 .byte W03 - .byte VOL , 94*se_w291_mvl/mxv + .byte VOL , 94*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v-3 .byte BEND , c_v+1 .byte W02 - .byte VOL , 84*se_w291_mvl/mxv + .byte VOL , 84*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+4 .byte W04 .byte PAN , c_v+3 - .byte VOL , 72*se_w291_mvl/mxv + .byte VOL , 72*se_m_dive_mvl/mxv .byte BEND , c_v+2 .byte W04 .byte PAN , c_v+6 - .byte VOL , 57*se_w291_mvl/mxv + .byte VOL , 57*se_m_dive_mvl/mxv .byte BEND , c_v-3 .byte W03 .byte PAN , c_v+3 - .byte VOL , 37*se_w291_mvl/mxv + .byte VOL , 37*se_m_dive_mvl/mxv .byte BEND , c_v-7 .byte W03 - .byte VOL , 20*se_w291_mvl/mxv + .byte VOL , 20*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v-11 .byte W01 - .byte VOL , 7*se_w291_mvl/mxv + .byte VOL , 7*se_m_dive_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte BEND , c_v-16 @@ -84,10 +84,10 @@ se_w291_1: @********************** Track 2 **********************@ -se_w291_2: - .byte KEYSH , se_w291_key+0 +se_m_dive_2: + .byte KEYSH , se_m_dive_key+0 .byte VOICE , 25 - .byte VOL , 105*se_w291_mvl/mxv + .byte VOL , 105*se_m_dive_mvl/mxv .byte N06 , An2 , v040 .byte W06 .byte Gn2 @@ -109,15 +109,15 @@ se_w291_2: @******************************************************@ .align 2 -se_w291: +se_m_dive: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w291_pri @ Priority - .byte se_w291_rev @ Reverb. + .byte se_m_dive_pri @ Priority + .byte se_m_dive_rev @ Reverb. - .word se_w291_grp + .word se_m_dive_grp - .word se_w291_1 - .word se_w291_2 + .word se_m_dive_1 + .word se_m_dive_2 .end diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s new file mode 100644 index 0000000000..886a4bc4e4 --- /dev/null +++ b/sound/songs/se_m_dizzy_punch.s @@ -0,0 +1,79 @@ + .include "MPlayDef.s" + + .equ se_m_dizzy_punch_grp, voicegroup128 + .equ se_m_dizzy_punch_pri, 4 + .equ se_m_dizzy_punch_rev, reverb_set+50 + .equ se_m_dizzy_punch_mvl, 127 + .equ se_m_dizzy_punch_key, 0 + .equ se_m_dizzy_punch_tbs, 1 + .equ se_m_dizzy_punch_exg, 0 + .equ se_m_dizzy_punch_cmp, 1 + + .section .rodata + .global se_m_dizzy_punch + .align 2 + +@********************** Track 1 **********************@ + +se_m_dizzy_punch_1: + .byte KEYSH , se_m_dizzy_punch_key+0 + .byte TEMPO , 150*se_m_dizzy_punch_tbs/2 + .byte VOICE , 19 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 5*se_m_dizzy_punch_mvl/mxv + .byte BEND , c_v+0 + .byte N07 , Bn5 , v080 + .byte W01 + .byte VOL , 55*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v+3 + .byte W01 + .byte VOL , 67*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+22 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-6 + .byte W01 + .byte PAN , c_v-12 + .byte BEND , c_v-14 + .byte W02 + .byte VOL , 4*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v-22 + .byte BEND , c_v-23 + .byte W01 + .byte PAN , c_v-13 + .byte BEND , c_v+0 + .byte N04 , Cn6 + .byte W01 + .byte VOL , 66*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+1 + .byte W01 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v+3 + .byte W01 + .byte VOL , 4*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+21 + .byte BEND , c_v+5 + .byte W14 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte FINE + +@******************************************************@ + .align 2 + +se_m_dizzy_punch: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_dizzy_punch_pri @ Priority + .byte se_m_dizzy_punch_rev @ Reverb. + + .word se_m_dizzy_punch_grp + + .word se_m_dizzy_punch_1 + + .end diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s new file mode 100644 index 0000000000..49bcfb13d3 --- /dev/null +++ b/sound/songs/se_m_double_team.s @@ -0,0 +1,71 @@ + .include "MPlayDef.s" + + .equ se_m_double_team_grp, voicegroup128 + .equ se_m_double_team_pri, 4 + .equ se_m_double_team_rev, reverb_set+50 + .equ se_m_double_team_mvl, 127 + .equ se_m_double_team_key, 0 + .equ se_m_double_team_tbs, 1 + .equ se_m_double_team_exg, 0 + .equ se_m_double_team_cmp, 1 + + .section .rodata + .global se_m_double_team + .align 2 + +@********************** Track 1 **********************@ + +se_m_double_team_1: + .byte KEYSH , se_m_double_team_key+0 + .byte TEMPO , 150*se_m_double_team_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_double_team_mvl/mxv + .byte BEND , c_v-18 + .byte N19 , Dn3 , v108 + .byte W02 + .byte BEND , c_v-7 + .byte W01 + .byte VOL , 101*se_m_double_team_mvl/mxv + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v+8 + .byte W02 + .byte VOL , 84*se_m_double_team_mvl/mxv + .byte BEND , c_v+4 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 64*se_m_double_team_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v+8 + .byte W02 + .byte VOL , 45*se_m_double_team_mvl/mxv + .byte BEND , c_v-31 + .byte W02 + .byte VOL , 32*se_m_double_team_mvl/mxv + .byte PAN , c_v+0 + .byte W01 + .byte VOICE , 2 + .byte W01 + .byte VOL , 13*se_m_double_team_mvl/mxv + .byte BEND , c_v-52 + .byte W08 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_double_team: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_double_team_pri @ Priority + .byte se_m_double_team_rev @ Reverb. + + .word se_m_double_team_grp + + .word se_m_double_team_1 + + .end diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s new file mode 100644 index 0000000000..e9eaefca0b --- /dev/null +++ b/sound/songs/se_m_dragon_rage.s @@ -0,0 +1,150 @@ + .include "MPlayDef.s" + + .equ se_m_dragon_rage_grp, voicegroup128 + .equ se_m_dragon_rage_pri, 4 + .equ se_m_dragon_rage_rev, reverb_set+50 + .equ se_m_dragon_rage_mvl, 127 + .equ se_m_dragon_rage_key, 0 + .equ se_m_dragon_rage_tbs, 1 + .equ se_m_dragon_rage_exg, 0 + .equ se_m_dragon_rage_cmp, 1 + + .section .rodata + .global se_m_dragon_rage + .align 2 + +@********************** Track 1 **********************@ + +se_m_dragon_rage_1: + .byte KEYSH , se_m_dragon_rage_key+0 + .byte TEMPO , 150*se_m_dragon_rage_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+5 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+0 + .byte N10 , An2 , v127 + .byte W02 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+10 + .byte N10 , Bn2 + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-2 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+18 + .byte N10 , Cs3 + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte 88*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 20*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+29 + .byte N10 , Dn3 + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+37 + .byte N10 , En3 + .byte W02 + .byte PAN , c_v-2 + .byte VOL , 46*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 102*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte 120*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte VOL , 20*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+42 + .byte N20 , Fs3 + .byte W02 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 99*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+50 + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 74*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte BEND , c_v+56 + .byte W01 + .byte PAN , c_v-2 + .byte VOL , 53*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte 34*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+63 + .byte W01 + .byte VOL , 15*se_m_dragon_rage_mvl/mxv + .byte W23 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_dragon_rage: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_dragon_rage_pri @ Priority + .byte se_m_dragon_rage_rev @ Reverb. + + .word se_m_dragon_rage_grp + + .word se_m_dragon_rage_1 + + .end diff --git a/sound/songs/se_w089.s b/sound/songs/se_m_earthquake.s similarity index 61% rename from sound/songs/se_w089.s rename to sound/songs/se_m_earthquake.s index 081988ee99..104eb1befa 100644 --- a/sound/songs/se_w089.s +++ b/sound/songs/se_m_earthquake.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w089_grp, voicegroup128 - .equ se_w089_pri, 4 - .equ se_w089_rev, reverb_set+50 - .equ se_w089_mvl, 127 - .equ se_w089_key, 0 - .equ se_w089_tbs, 1 - .equ se_w089_exg, 0 - .equ se_w089_cmp, 1 + .equ se_m_earthquake_grp, voicegroup128 + .equ se_m_earthquake_pri, 4 + .equ se_m_earthquake_rev, reverb_set+50 + .equ se_m_earthquake_mvl, 127 + .equ se_m_earthquake_key, 0 + .equ se_m_earthquake_tbs, 1 + .equ se_m_earthquake_exg, 0 + .equ se_m_earthquake_cmp, 1 .section .rodata - .global se_w089 + .global se_m_earthquake .align 2 @********************** Track 1 **********************@ -se_w089_1: - .byte KEYSH , se_w089_key+0 - .byte TEMPO , 150*se_w089_tbs/2 +se_m_earthquake_1: + .byte KEYSH , se_m_earthquake_key+0 + .byte TEMPO , 150*se_m_earthquake_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w089_mvl/mxv + .byte VOL , 110*se_m_earthquake_mvl/mxv .byte BEND , c_v+0 .byte N03 , Cs2 , v127 .byte W03 @@ -35,13 +35,13 @@ se_w089_1: .byte PAN , c_v+11 .byte N03 , Cn2 , v112 .byte W02 -se_w089_1_000: +se_m_earthquake_1_000: .byte W02 .byte PAN , c_v-11 .byte N03 , Cs2 , v108 .byte W04 .byte PEND -se_w089_1_001: +se_m_earthquake_1_001: .byte PAN , c_v+0 .byte N03 , Cn2 , v100 .byte W03 @@ -49,7 +49,7 @@ se_w089_1_001: .byte N03 , Cs2 , v116 .byte W03 .byte PEND -se_w089_1_002: +se_m_earthquake_1_002: .byte W01 .byte PAN , c_v-6 .byte N03 , Cn2 , v112 @@ -58,13 +58,13 @@ se_w089_1_002: .byte N03 , Cs2 , v108 .byte W02 .byte PEND -se_w089_1_003: +se_m_earthquake_1_003: .byte W02 .byte PAN , c_v-11 .byte N03 , Cn2 , v100 .byte W04 .byte PEND -se_w089_1_004: +se_m_earthquake_1_004: .byte PAN , c_v+0 .byte N03 , Cs2 , v116 .byte W03 @@ -72,7 +72,7 @@ se_w089_1_004: .byte N03 , Cn2 , v112 .byte W03 .byte PEND -se_w089_1_005: +se_m_earthquake_1_005: .byte W01 .byte PAN , c_v-6 .byte N03 , Cs2 , v108 @@ -81,7 +81,7 @@ se_w089_1_005: .byte N03 , Cn2 , v100 .byte W02 .byte PEND -se_w089_1_006: +se_m_earthquake_1_006: .byte W02 .byte PAN , c_v-11 .byte N03 , Cs2 , v116 @@ -104,7 +104,7 @@ se_w089_1_006: .byte PAN , c_v-11 .byte N03 , Cn2 , v112 .byte W04 -se_w089_1_007: +se_m_earthquake_1_007: .byte PAN , c_v+0 .byte N03 , Cs2 , v108 .byte W03 @@ -112,7 +112,7 @@ se_w089_1_007: .byte N03 , Cn2 , v100 .byte W03 .byte PEND -se_w089_1_008: +se_m_earthquake_1_008: .byte W01 .byte PAN , c_v-6 .byte N03 , Cs2 , v116 @@ -122,91 +122,91 @@ se_w089_1_008: .byte W02 .byte PEND .byte PATT - .word se_w089_1_000 + .word se_m_earthquake_1_000 .byte PATT - .word se_w089_1_001 + .word se_m_earthquake_1_001 .byte PATT - .word se_w089_1_002 + .word se_m_earthquake_1_002 .byte PATT - .word se_w089_1_003 + .word se_m_earthquake_1_003 .byte PATT - .word se_w089_1_007 + .word se_m_earthquake_1_007 .byte PATT - .word se_w089_1_008 + .word se_m_earthquake_1_008 .byte PATT - .word se_w089_1_000 + .word se_m_earthquake_1_000 .byte PATT - .word se_w089_1_001 + .word se_m_earthquake_1_001 .byte PATT - .word se_w089_1_002 + .word se_m_earthquake_1_002 .byte PATT - .word se_w089_1_003 + .word se_m_earthquake_1_003 .byte PATT - .word se_w089_1_004 + .word se_m_earthquake_1_004 .byte PATT - .word se_w089_1_005 + .word se_m_earthquake_1_005 .byte PATT - .word se_w089_1_006 - .byte VOL , 106*se_w089_mvl/mxv + .word se_m_earthquake_1_006 + .byte VOL , 106*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cn2 , v112 .byte W03 - .byte VOL , 103*se_w089_mvl/mxv + .byte VOL , 103*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte N03 , Cs2 , v108 .byte W03 .byte W01 - .byte VOL , 97*se_w089_mvl/mxv + .byte VOL , 97*se_m_earthquake_mvl/mxv .byte PAN , c_v-6 .byte N03 , Cn2 , v100 .byte W03 - .byte VOL , 89*se_w089_mvl/mxv + .byte VOL , 89*se_m_earthquake_mvl/mxv .byte PAN , c_v+11 .byte N03 , Cs2 , v116 .byte W02 .byte W02 - .byte VOL , 85*se_w089_mvl/mxv + .byte VOL , 85*se_m_earthquake_mvl/mxv .byte PAN , c_v-11 .byte N03 , Cn2 , v112 .byte W04 - .byte VOL , 78*se_w089_mvl/mxv + .byte VOL , 78*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cs2 , v108 .byte W03 - .byte VOL , 72*se_w089_mvl/mxv + .byte VOL , 72*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte N03 , Cn2 , v100 .byte W03 .byte W01 - .byte VOL , 66*se_w089_mvl/mxv + .byte VOL , 66*se_m_earthquake_mvl/mxv .byte PAN , c_v-6 .byte N03 , Cs2 , v116 .byte W03 - .byte VOL , 58*se_w089_mvl/mxv + .byte VOL , 58*se_m_earthquake_mvl/mxv .byte PAN , c_v+11 .byte N03 , Cn2 , v112 .byte W02 .byte W02 - .byte VOL , 46*se_w089_mvl/mxv + .byte VOL , 46*se_m_earthquake_mvl/mxv .byte PAN , c_v-11 .byte N03 , Cs2 , v108 .byte W04 - .byte VOL , 30*se_w089_mvl/mxv + .byte VOL , 30*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cn2 , v100 .byte W03 - .byte VOL , 12*se_w089_mvl/mxv + .byte VOL , 12*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte W03 .byte FINE @********************** Track 2 **********************@ -se_w089_2: - .byte KEYSH , se_w089_key+0 +se_m_earthquake_2: + .byte KEYSH , se_m_earthquake_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 110*se_w089_mvl/mxv + .byte VOL , 110*se_m_earthquake_mvl/mxv .byte N02 , Fn2 , v072 .byte W02 .byte N01 @@ -218,7 +218,7 @@ se_w089_2: .byte VOICE , 27 .byte N06 , Bn1 , v080 .byte W06 -se_w089_2_000: +se_m_earthquake_2_000: .byte PAN , c_v+0 .byte N06 , Bn1 , v080 .byte W06 @@ -228,99 +228,99 @@ se_w089_2_000: .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 - .byte VOL , 106*se_w089_mvl/mxv + .byte VOL , 106*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 103*se_w089_mvl/mxv + .byte VOL , 103*se_m_earthquake_mvl/mxv .byte W03 .byte N06 .byte W01 - .byte VOL , 97*se_w089_mvl/mxv + .byte VOL , 97*se_m_earthquake_mvl/mxv .byte W03 - .byte 89*se_w089_mvl/mxv + .byte 89*se_m_earthquake_mvl/mxv .byte W02 .byte N06 .byte W02 - .byte VOL , 85*se_w089_mvl/mxv + .byte VOL , 85*se_m_earthquake_mvl/mxv .byte W04 - .byte 78*se_w089_mvl/mxv + .byte 78*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 72*se_w089_mvl/mxv + .byte VOL , 72*se_m_earthquake_mvl/mxv .byte W03 .byte N06 .byte W01 - .byte VOL , 66*se_w089_mvl/mxv + .byte VOL , 66*se_m_earthquake_mvl/mxv .byte W03 - .byte 58*se_w089_mvl/mxv + .byte 58*se_m_earthquake_mvl/mxv .byte W02 .byte N06 .byte W02 - .byte VOL , 46*se_w089_mvl/mxv + .byte VOL , 46*se_m_earthquake_mvl/mxv .byte W04 - .byte 30*se_w089_mvl/mxv + .byte 30*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 12*se_w089_mvl/mxv + .byte VOL , 12*se_m_earthquake_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w089: +se_m_earthquake: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w089_pri @ Priority - .byte se_w089_rev @ Reverb. + .byte se_m_earthquake_pri @ Priority + .byte se_m_earthquake_rev @ Reverb. - .word se_w089_grp + .word se_m_earthquake_grp - .word se_w089_1 - .word se_w089_2 + .word se_m_earthquake_1 + .word se_m_earthquake_2 .end diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s new file mode 100644 index 0000000000..a685ca24c9 --- /dev/null +++ b/sound/songs/se_m_ember.s @@ -0,0 +1,61 @@ + .include "MPlayDef.s" + + .equ se_m_ember_grp, voicegroup128 + .equ se_m_ember_pri, 4 + .equ se_m_ember_rev, reverb_set+50 + .equ se_m_ember_mvl, 127 + .equ se_m_ember_key, 0 + .equ se_m_ember_tbs, 1 + .equ se_m_ember_exg, 0 + .equ se_m_ember_cmp, 1 + + .section .rodata + .global se_m_ember + .align 2 + +@********************** Track 1 **********************@ + +se_m_ember_1: + .byte KEYSH , se_m_ember_key+0 + .byte TEMPO , 150*se_m_ember_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 61*se_m_ember_mvl/mxv + .byte BEND , c_v+8 + .byte N10 , Gn3 , v127 + .byte W01 + .byte VOL , 84*se_m_ember_mvl/mxv + .byte W01 + .byte 97*se_m_ember_mvl/mxv + .byte BEND , c_v+16 + .byte W01 + .byte VOL , 110*se_m_ember_mvl/mxv + .byte W01 + .byte BEND , c_v+7 + .byte W02 + .byte c_v-12 + .byte W01 + .byte VOL , 89*se_m_ember_mvl/mxv + .byte W01 + .byte 64*se_m_ember_mvl/mxv + .byte BEND , c_v-42 + .byte W01 + .byte VOL , 34*se_m_ember_mvl/mxv + .byte W15 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_ember: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_ember_pri @ Priority + .byte se_m_ember_rev @ Reverb. + + .word se_m_ember_grp + + .word se_m_ember_1 + + .end diff --git a/sound/songs/se_w227.s b/sound/songs/se_m_encore.s similarity index 55% rename from sound/songs/se_w227.s rename to sound/songs/se_m_encore.s index 7a6f87abc3..cf13ab7618 100644 --- a/sound/songs/se_w227.s +++ b/sound/songs/se_m_encore.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w227_grp, voicegroup128 - .equ se_w227_pri, 4 - .equ se_w227_rev, reverb_set+50 - .equ se_w227_mvl, 127 - .equ se_w227_key, 0 - .equ se_w227_tbs, 1 - .equ se_w227_exg, 0 - .equ se_w227_cmp, 1 + .equ se_m_encore_grp, voicegroup128 + .equ se_m_encore_pri, 4 + .equ se_m_encore_rev, reverb_set+50 + .equ se_m_encore_mvl, 127 + .equ se_m_encore_key, 0 + .equ se_m_encore_tbs, 1 + .equ se_m_encore_exg, 0 + .equ se_m_encore_cmp, 1 .section .rodata - .global se_w227 + .global se_m_encore .align 2 @********************** Track 1 **********************@ -se_w227_1: - .byte KEYSH , se_w227_key+0 - .byte TEMPO , 150*se_w227_tbs/2 +se_m_encore_1: + .byte KEYSH , se_m_encore_key+0 + .byte TEMPO , 150*se_m_encore_tbs/2 .byte VOICE , 59 .byte BENDR , 12 - .byte VOL , 110*se_w227_mvl/mxv + .byte VOL , 110*se_m_encore_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N06 , En3 , v127 @@ -45,14 +45,14 @@ se_w227_1: @******************************************************@ .align 2 -se_w227: +se_m_encore: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w227_pri @ Priority - .byte se_w227_rev @ Reverb. + .byte se_m_encore_pri @ Priority + .byte se_m_encore_rev @ Reverb. - .word se_w227_grp + .word se_m_encore_grp - .word se_w227_1 + .word se_m_encore_1 .end diff --git a/sound/songs/se_w227b.s b/sound/songs/se_m_encore2.s similarity index 59% rename from sound/songs/se_w227b.s rename to sound/songs/se_m_encore2.s index a3fa4adfe4..9c53cdfe3c 100644 --- a/sound/songs/se_w227b.s +++ b/sound/songs/se_m_encore2.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w227b_grp, voicegroup128 - .equ se_w227b_pri, 4 - .equ se_w227b_rev, reverb_set+50 - .equ se_w227b_mvl, 127 - .equ se_w227b_key, 0 - .equ se_w227b_tbs, 1 - .equ se_w227b_exg, 0 - .equ se_w227b_cmp, 1 + .equ se_m_encore2_grp, voicegroup128 + .equ se_m_encore2_pri, 4 + .equ se_m_encore2_rev, reverb_set+50 + .equ se_m_encore2_mvl, 127 + .equ se_m_encore2_key, 0 + .equ se_m_encore2_tbs, 1 + .equ se_m_encore2_exg, 0 + .equ se_m_encore2_cmp, 1 .section .rodata - .global se_w227b + .global se_m_encore2 .align 2 @********************** Track 1 **********************@ -se_w227b_1: - .byte KEYSH , se_w227b_key+0 - .byte TEMPO , 150*se_w227b_tbs/2 +se_m_encore2_1: + .byte KEYSH , se_m_encore2_key+0 + .byte TEMPO , 150*se_m_encore2_tbs/2 .byte VOICE , 60 .byte BENDR , 12 - .byte VOL , 25*se_w227b_mvl/mxv + .byte VOL , 25*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte TIE , Cn3 , v127 @@ -29,18 +29,18 @@ se_w227b_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 34*se_w227b_mvl/mxv + .byte VOL , 34*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 46*se_w227b_mvl/mxv + .byte VOL , 46*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 56*se_w227b_mvl/mxv + .byte VOL , 56*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 @@ -49,30 +49,30 @@ se_w227b_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 70*se_w227b_mvl/mxv + .byte VOL , 70*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 80*se_w227b_mvl/mxv + .byte VOL , 80*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 88*se_w227b_mvl/mxv + .byte VOL , 88*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 .byte W01 .byte c_v+2 .byte W01 - .byte VOL , 96*se_w227b_mvl/mxv + .byte VOL , 96*se_m_encore2_mvl/mxv .byte PAN , c_v+5 .byte W02 .byte c_v+2 .byte W02 - .byte VOL , 100*se_w227b_mvl/mxv + .byte VOL , 100*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v-2 @@ -81,7 +81,7 @@ se_w227b_1: .byte W02 .byte c_v-2 .byte W02 -se_w227b_1_000: +se_m_encore2_1_000: .byte PAN , c_v+0 .byte W01 .byte c_v+2 @@ -100,58 +100,58 @@ se_w227b_1_000: .byte W02 .byte PEND .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 - .byte VOL , 96*se_w227b_mvl/mxv + .word se_m_encore2_1_000 + .byte VOL , 96*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 92*se_w227b_mvl/mxv + .byte VOL , 92*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 84*se_w227b_mvl/mxv + .byte VOL , 84*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 72*se_w227b_mvl/mxv + .byte VOL , 72*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 .byte W01 .byte c_v+2 .byte W01 - .byte VOL , 63*se_w227b_mvl/mxv + .byte VOL , 63*se_m_encore2_mvl/mxv .byte PAN , c_v+5 .byte W02 - .byte VOL , 52*se_w227b_mvl/mxv + .byte VOL , 52*se_m_encore2_mvl/mxv .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 37*se_w227b_mvl/mxv + .byte VOL , 37*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W01 - .byte VOL , 22*se_w227b_mvl/mxv + .byte VOL , 22*se_m_encore2_mvl/mxv .byte W01 - .byte 12*se_w227b_mvl/mxv + .byte 12*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte EOT , Cn3 @@ -160,14 +160,14 @@ se_w227b_1_000: @******************************************************@ .align 2 -se_w227b: +se_m_encore2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w227b_pri @ Priority - .byte se_w227b_rev @ Reverb. + .byte se_m_encore2_pri @ Priority + .byte se_m_encore2_rev @ Reverb. - .word se_w227b_grp + .word se_m_encore2_grp - .word se_w227b_1 + .word se_m_encore2_1 .end diff --git a/sound/songs/se_w153.s b/sound/songs/se_m_explosion.s similarity index 65% rename from sound/songs/se_w153.s rename to sound/songs/se_m_explosion.s index fe4e25a9e3..c93f485b88 100644 --- a/sound/songs/se_w153.s +++ b/sound/songs/se_m_explosion.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w153_grp, voicegroup128 - .equ se_w153_pri, 4 - .equ se_w153_rev, reverb_set+50 - .equ se_w153_mvl, 127 - .equ se_w153_key, 0 - .equ se_w153_tbs, 1 - .equ se_w153_exg, 0 - .equ se_w153_cmp, 1 + .equ se_m_explosion_grp, voicegroup128 + .equ se_m_explosion_pri, 4 + .equ se_m_explosion_rev, reverb_set+50 + .equ se_m_explosion_mvl, 127 + .equ se_m_explosion_key, 0 + .equ se_m_explosion_tbs, 1 + .equ se_m_explosion_exg, 0 + .equ se_m_explosion_cmp, 1 .section .rodata - .global se_w153 + .global se_m_explosion .align 2 @********************** Track 1 **********************@ -se_w153_1: - .byte KEYSH , se_w153_key+0 - .byte TEMPO , 150*se_w153_tbs/2 +se_m_explosion_1: + .byte KEYSH , se_m_explosion_key+0 + .byte TEMPO , 150*se_m_explosion_tbs/2 .byte VOICE , 41 - .byte VOL , 125*se_w153_mvl/mxv + .byte VOL , 125*se_m_explosion_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -82,20 +82,20 @@ se_w153_1: @********************** Track 2 **********************@ -se_w153_2: - .byte KEYSH , se_w153_key+0 +se_m_explosion_2: + .byte KEYSH , se_m_explosion_key+0 .byte VOICE , 4 - .byte VOL , 125*se_w153_mvl/mxv + .byte VOL , 125*se_m_explosion_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte N02 , Cn3 , v052 .byte W01 - .byte VOL , 74*se_w153_mvl/mxv + .byte VOL , 74*se_m_explosion_mvl/mxv .byte W06 - .byte 125*se_w153_mvl/mxv + .byte 125*se_m_explosion_mvl/mxv .byte N02 .byte W01 - .byte VOL , 74*se_w153_mvl/mxv + .byte VOL , 74*se_m_explosion_mvl/mxv .byte W16 .byte W24 .byte W24 @@ -104,15 +104,15 @@ se_w153_2: @******************************************************@ .align 2 -se_w153: +se_m_explosion: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w153_pri @ Priority - .byte se_w153_rev @ Reverb. + .byte se_m_explosion_pri @ Priority + .byte se_m_explosion_rev @ Reverb. - .word se_w153_grp + .word se_m_explosion_grp - .word se_w153_1 - .word se_w153_2 + .word se_m_explosion_1 + .word se_m_explosion_2 .end diff --git a/sound/songs/se_w185.s b/sound/songs/se_m_faint_attack.s similarity index 66% rename from sound/songs/se_w185.s rename to sound/songs/se_m_faint_attack.s index 8ec9ebfe84..ce53c7173e 100644 --- a/sound/songs/se_w185.s +++ b/sound/songs/se_m_faint_attack.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w185_grp, voicegroup128 - .equ se_w185_pri, 4 - .equ se_w185_rev, reverb_set+50 - .equ se_w185_mvl, 127 - .equ se_w185_key, 0 - .equ se_w185_tbs, 1 - .equ se_w185_exg, 0 - .equ se_w185_cmp, 1 + .equ se_m_faint_attack_grp, voicegroup128 + .equ se_m_faint_attack_pri, 4 + .equ se_m_faint_attack_rev, reverb_set+50 + .equ se_m_faint_attack_mvl, 127 + .equ se_m_faint_attack_key, 0 + .equ se_m_faint_attack_tbs, 1 + .equ se_m_faint_attack_exg, 0 + .equ se_m_faint_attack_cmp, 1 .section .rodata - .global se_w185 + .global se_m_faint_attack .align 2 @********************** Track 1 **********************@ -se_w185_1: - .byte KEYSH , se_w185_key+0 - .byte TEMPO , 150*se_w185_tbs/2 +se_m_faint_attack_1: + .byte KEYSH , se_m_faint_attack_key+0 + .byte TEMPO , 150*se_m_faint_attack_tbs/2 .byte VOICE , 45 - .byte VOL , 100*se_w185_mvl/mxv + .byte VOL , 100*se_m_faint_attack_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v-5 @@ -76,14 +76,14 @@ se_w185_1: @******************************************************@ .align 2 -se_w185: +se_m_faint_attack: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w185_pri @ Priority - .byte se_w185_rev @ Reverb. + .byte se_m_faint_attack_pri @ Priority + .byte se_m_faint_attack_rev @ Reverb. - .word se_w185_grp + .word se_m_faint_attack_grp - .word se_w185_1 + .word se_m_faint_attack_1 .end diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s new file mode 100644 index 0000000000..797073466a --- /dev/null +++ b/sound/songs/se_m_flame_wheel.s @@ -0,0 +1,124 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel_grp, voicegroup128 + .equ se_m_flame_wheel_pri, 4 + .equ se_m_flame_wheel_rev, reverb_set+50 + .equ se_m_flame_wheel_mvl, 127 + .equ se_m_flame_wheel_key, 0 + .equ se_m_flame_wheel_tbs, 1 + .equ se_m_flame_wheel_exg, 0 + .equ se_m_flame_wheel_cmp, 1 + + .section .rodata + .global se_m_flame_wheel + .align 2 + +@********************** Track 1 **********************@ + +se_m_flame_wheel_1: + .byte KEYSH , se_m_flame_wheel_key+0 + .byte TEMPO , 150*se_m_flame_wheel_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 22*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v+0 + .byte N30 , Dn4 , v127 + .byte W01 + .byte VOL , 49*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 71*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v+8 + .byte W01 + .byte VOL , 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte BEND , c_v+16 + .byte W01 + .byte VOL , 95*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 88*se_m_flame_wheel_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+7 + .byte W01 + .byte VOL , 93*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte PAN , c_v-5 + .byte BEND , c_v+0 + .byte W02 + .byte VOL , 86*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v-9 + .byte W01 + .byte VOL , 63*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 37*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v-24 + .byte W03 + .byte VOL , 13*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v-46 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_flame_wheel_2: + .byte KEYSH , se_m_flame_wheel_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 22*se_m_flame_wheel_mvl/mxv + .byte N30 , Gn2 , v032 + .byte W01 + .byte VOL , 49*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 71*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 88*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 93*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 86*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte W01 + .byte 63*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 37*se_m_flame_wheel_mvl/mxv + .byte W03 + .byte 13*se_m_flame_wheel_mvl/mxv + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flame_wheel: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flame_wheel_pri @ Priority + .byte se_m_flame_wheel_rev @ Reverb. + + .word se_m_flame_wheel_grp + + .word se_m_flame_wheel_1 + .word se_m_flame_wheel_2 + + .end diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s new file mode 100644 index 0000000000..21f911b0ba --- /dev/null +++ b/sound/songs/se_m_flame_wheel2.s @@ -0,0 +1,99 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel2_grp, voicegroup128 + .equ se_m_flame_wheel2_pri, 4 + .equ se_m_flame_wheel2_rev, reverb_set+50 + .equ se_m_flame_wheel2_mvl, 127 + .equ se_m_flame_wheel2_key, 0 + .equ se_m_flame_wheel2_tbs, 1 + .equ se_m_flame_wheel2_exg, 0 + .equ se_m_flame_wheel2_cmp, 1 + + .section .rodata + .global se_m_flame_wheel2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_flame_wheel2_1: + .byte KEYSH , se_m_flame_wheel2_key+0 + .byte TEMPO , 150*se_m_flame_wheel2_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_flame_wheel2_mvl/mxv + .byte BEND , c_v+0 + .byte N48 , Cn4 , v127 + .byte W06 + .byte PAN , c_v+4 + .byte W03 + .byte BEND , c_v+2 + .byte W03 + .byte PAN , c_v+10 + .byte W03 + .byte BEND , c_v+5 + .byte W03 + .byte VOL , 98*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+4 + .byte W03 + .byte BEND , c_v+3 + .byte W03 + .byte VOL , 88*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte BEND , c_v-5 + .byte W03 + .byte VOL , 68*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v-5 + .byte W03 + .byte c_v+7 + .byte BEND , c_v-9 + .byte W03 + .byte VOL , 44*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte BEND , c_v-15 + .byte W03 + .byte VOL , 13*se_m_flame_wheel2_mvl/mxv + .byte BEND , c_v-24 + .byte W03 + .byte c_v-40 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_flame_wheel2_2: + .byte KEYSH , se_m_flame_wheel2_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_flame_wheel2_mvl/mxv + .byte N48 , Gn2 , v032 + .byte W18 + .byte VOL , 98*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 88*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 68*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 44*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 13*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flame_wheel2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flame_wheel2_pri @ Priority + .byte se_m_flame_wheel2_rev @ Reverb. + + .word se_m_flame_wheel2_grp + + .word se_m_flame_wheel2_1 + .word se_m_flame_wheel2_2 + + .end diff --git a/sound/songs/se_w053.s b/sound/songs/se_m_flamethrower.s similarity index 60% rename from sound/songs/se_w053.s rename to sound/songs/se_m_flamethrower.s index 7c414896a4..29438337ff 100644 --- a/sound/songs/se_w053.s +++ b/sound/songs/se_m_flamethrower.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w053_grp, voicegroup128 - .equ se_w053_pri, 4 - .equ se_w053_rev, reverb_set+50 - .equ se_w053_mvl, 127 - .equ se_w053_key, 0 - .equ se_w053_tbs, 1 - .equ se_w053_exg, 0 - .equ se_w053_cmp, 1 + .equ se_m_flamethrower_grp, voicegroup128 + .equ se_m_flamethrower_pri, 4 + .equ se_m_flamethrower_rev, reverb_set+50 + .equ se_m_flamethrower_mvl, 127 + .equ se_m_flamethrower_key, 0 + .equ se_m_flamethrower_tbs, 1 + .equ se_m_flamethrower_exg, 0 + .equ se_m_flamethrower_cmp, 1 .section .rodata - .global se_w053 + .global se_m_flamethrower .align 2 @********************** Track 1 **********************@ -se_w053_1: - .byte KEYSH , se_w053_key+0 - .byte TEMPO , 150*se_w053_tbs/2 +se_m_flamethrower_1: + .byte KEYSH , se_m_flamethrower_key+0 + .byte TEMPO , 150*se_m_flamethrower_tbs/2 .byte VOICE , 29 .byte BENDR , 12 - .byte VOL , 110*se_w053_mvl/mxv + .byte VOL , 110*se_m_flamethrower_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+50 .byte TIE , Cn3 , v127 @@ -66,7 +66,7 @@ se_w053_1: .byte W03 .byte c_v+0 .byte W03 -se_w053_1_000: +se_m_flamethrower_1_000: .byte PAN , c_v+4 .byte W03 .byte c_v-5 @@ -83,48 +83,48 @@ se_w053_1_000: .byte W03 .byte PEND .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PAN , c_v+4 .byte W03 .byte c_v-5 .byte W03 - .byte VOL , 103*se_w053_mvl/mxv + .byte VOL , 103*se_m_flamethrower_mvl/mxv .byte W01 .byte PAN , c_v+8 .byte W03 - .byte VOL , 96*se_w053_mvl/mxv + .byte VOL , 96*se_m_flamethrower_mvl/mxv .byte PAN , c_v-9 .byte W04 .byte c_v+4 .byte W02 - .byte VOL , 88*se_w053_mvl/mxv + .byte VOL , 88*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v-5 .byte W03 .byte c_v+0 .byte W01 - .byte VOL , 73*se_w053_mvl/mxv + .byte VOL , 73*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W03 - .byte VOL , 62*se_w053_mvl/mxv + .byte VOL , 62*se_m_flamethrower_mvl/mxv .byte PAN , c_v-5 .byte W04 .byte c_v+8 .byte W01 - .byte VOL , 47*se_w053_mvl/mxv + .byte VOL , 47*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v-9 .byte W03 - .byte VOL , 27*se_w053_mvl/mxv + .byte VOL , 27*se_m_flamethrower_mvl/mxv .byte W01 .byte PAN , c_v+4 .byte W04 - .byte VOL , 10*se_w053_mvl/mxv + .byte VOL , 10*se_m_flamethrower_mvl/mxv .byte PAN , c_v-5 .byte W03 .byte c_v+0 @@ -134,20 +134,20 @@ se_w053_1_000: @********************** Track 2 **********************@ -se_w053_2: - .byte KEYSH , se_w053_key+0 +se_m_flamethrower_2: + .byte KEYSH , se_m_flamethrower_key+0 .byte VOICE , 27 .byte PAN , c_v+0 - .byte VOL , 110*se_w053_mvl/mxv + .byte VOL , 110*se_m_flamethrower_mvl/mxv .byte N24 , Fn2 , v060 .byte W10 - .byte VOL , 99*se_w053_mvl/mxv + .byte VOL , 99*se_m_flamethrower_mvl/mxv .byte W05 - .byte 82*se_w053_mvl/mxv + .byte 82*se_m_flamethrower_mvl/mxv .byte W04 - .byte 54*se_w053_mvl/mxv + .byte 54*se_m_flamethrower_mvl/mxv .byte W02 - .byte 25*se_w053_mvl/mxv + .byte 25*se_m_flamethrower_mvl/mxv .byte W03 .byte W24 .byte W24 @@ -161,15 +161,15 @@ se_w053_2: @******************************************************@ .align 2 -se_w053: +se_m_flamethrower: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w053_pri @ Priority - .byte se_w053_rev @ Reverb. + .byte se_m_flamethrower_pri @ Priority + .byte se_m_flamethrower_rev @ Reverb. - .word se_w053_grp + .word se_m_flamethrower_grp - .word se_w053_1 - .word se_w053_2 + .word se_m_flamethrower_1 + .word se_m_flamethrower_2 .end diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s new file mode 100644 index 0000000000..e3746c990a --- /dev/null +++ b/sound/songs/se_m_flatter.s @@ -0,0 +1,67 @@ + .include "MPlayDef.s" + + .equ se_m_flatter_grp, voicegroup128 + .equ se_m_flatter_pri, 4 + .equ se_m_flatter_rev, reverb_set+50 + .equ se_m_flatter_mvl, 127 + .equ se_m_flatter_key, 0 + .equ se_m_flatter_tbs, 1 + .equ se_m_flatter_exg, 0 + .equ se_m_flatter_cmp, 1 + + .section .rodata + .global se_m_flatter + .align 2 + +@********************** Track 1 **********************@ + +se_m_flatter_1: + .byte KEYSH , se_m_flatter_key+0 + .byte TEMPO , 150*se_m_flatter_tbs/2 + .byte VOICE , 41 + .byte VOL , 100*se_m_flatter_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N01 , Dn5 , v127 + .byte W01 + .byte Gn4 + .byte W01 + .byte N09 , En5 + .byte W02 + .byte PAN , c_v+6 + .byte W02 + .byte VOL , 92*se_m_flatter_mvl/mxv + .byte PAN , c_v-8 + .byte W01 + .byte VOL , 83*se_m_flatter_mvl/mxv + .byte PAN , c_v+6 + .byte W01 + .byte VOL , 71*se_m_flatter_mvl/mxv + .byte PAN , c_v-8 + .byte BEND , c_v-4 + .byte W01 + .byte VOL , 46*se_m_flatter_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 22*se_m_flatter_mvl/mxv + .byte PAN , c_v-12 + .byte BEND , c_v-15 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flatter: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flatter_pri @ Priority + .byte se_m_flatter_rev @ Reverb. + + .word se_m_flatter_grp + + .word se_m_flatter_1 + + .end diff --git a/sound/songs/se_w202.s b/sound/songs/se_m_giga_drain.s similarity index 65% rename from sound/songs/se_w202.s rename to sound/songs/se_m_giga_drain.s index 6149a878d3..4596a0252c 100644 --- a/sound/songs/se_w202.s +++ b/sound/songs/se_m_giga_drain.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w202_grp, voicegroup128 - .equ se_w202_pri, 4 - .equ se_w202_rev, reverb_set+50 - .equ se_w202_mvl, 127 - .equ se_w202_key, 0 - .equ se_w202_tbs, 1 - .equ se_w202_exg, 0 - .equ se_w202_cmp, 1 + .equ se_m_giga_drain_grp, voicegroup128 + .equ se_m_giga_drain_pri, 4 + .equ se_m_giga_drain_rev, reverb_set+50 + .equ se_m_giga_drain_mvl, 127 + .equ se_m_giga_drain_key, 0 + .equ se_m_giga_drain_tbs, 1 + .equ se_m_giga_drain_exg, 0 + .equ se_m_giga_drain_cmp, 1 .section .rodata - .global se_w202 + .global se_m_giga_drain .align 2 @********************** Track 1 **********************@ -se_w202_1: - .byte KEYSH , se_w202_key+0 - .byte TEMPO , 150*se_w202_tbs/2 +se_m_giga_drain_1: + .byte KEYSH , se_m_giga_drain_key+0 + .byte TEMPO , 150*se_m_giga_drain_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w202_mvl/mxv + .byte VOL , 110*se_m_giga_drain_mvl/mxv .byte BEND , c_v+0 .byte N03 , Gn2 , v127 .byte W02 @@ -68,14 +68,14 @@ se_w202_1: @******************************************************@ .align 2 -se_w202: +se_m_giga_drain: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w202_pri @ Priority - .byte se_w202_rev @ Reverb. + .byte se_m_giga_drain_pri @ Priority + .byte se_m_giga_drain_rev @ Reverb. - .word se_w202_grp + .word se_m_giga_drain_grp - .word se_w202_1 + .word se_m_giga_drain_1 .end diff --git a/sound/songs/se_w320.s b/sound/songs/se_m_grasswhistle.s similarity index 58% rename from sound/songs/se_w320.s rename to sound/songs/se_m_grasswhistle.s index 82d93b571d..111bc2166d 100644 --- a/sound/songs/se_w320.s +++ b/sound/songs/se_m_grasswhistle.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_w320_grp, voicegroup128 - .equ se_w320_pri, 4 - .equ se_w320_rev, reverb_set+50 - .equ se_w320_mvl, 127 - .equ se_w320_key, 0 - .equ se_w320_tbs, 1 - .equ se_w320_exg, 0 - .equ se_w320_cmp, 1 + .equ se_m_grasswhistle_grp, voicegroup128 + .equ se_m_grasswhistle_pri, 4 + .equ se_m_grasswhistle_rev, reverb_set+50 + .equ se_m_grasswhistle_mvl, 127 + .equ se_m_grasswhistle_key, 0 + .equ se_m_grasswhistle_tbs, 1 + .equ se_m_grasswhistle_exg, 0 + .equ se_m_grasswhistle_cmp, 1 .section .rodata - .global se_w320 + .global se_m_grasswhistle .align 2 @********************** Track 1 **********************@ -se_w320_1: - .byte KEYSH , se_w320_key+0 - .byte TEMPO , 100*se_w320_tbs/2 +se_m_grasswhistle_1: + .byte KEYSH , se_m_grasswhistle_key+0 + .byte TEMPO , 100*se_m_grasswhistle_tbs/2 .byte VOICE , 64 .byte BENDR , 2 .byte LFOS , 40 .byte PAN , c_v+0 - .byte VOL , 70*se_w320_mvl/mxv + .byte VOL , 70*se_m_grasswhistle_mvl/mxv .byte BEND , c_v-16 .byte N21 , Gn5 , v112 .byte W03 @@ -52,24 +52,24 @@ se_w320_1: .byte W12 .byte W12 .byte W06 - .byte VOL , 61*se_w320_mvl/mxv + .byte VOL , 61*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 51*se_w320_mvl/mxv + .byte 51*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 36*se_w320_mvl/mxv + .byte 36*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 18*se_w320_mvl/mxv + .byte 18*se_m_grasswhistle_mvl/mxv .byte W12 .byte FINE @********************** Track 2 **********************@ -se_w320_2: - .byte KEYSH , se_w320_key+0 +se_m_grasswhistle_2: + .byte KEYSH , se_m_grasswhistle_key+0 .byte VOICE , 64 .byte BENDR , 2 .byte LFOS , 40 - .byte VOL , 70*se_w320_mvl/mxv + .byte VOL , 70*se_m_grasswhistle_mvl/mxv .byte W12 .byte PAN , c_v+12 .byte BEND , c_v-16 @@ -103,28 +103,28 @@ se_w320_2: .byte MOD , 10 .byte W12 .byte W06 - .byte VOL , 61*se_w320_mvl/mxv + .byte VOL , 61*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 51*se_w320_mvl/mxv + .byte 51*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 36*se_w320_mvl/mxv + .byte 36*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 18*se_w320_mvl/mxv + .byte 18*se_m_grasswhistle_mvl/mxv .byte W12 .byte FINE @******************************************************@ .align 2 -se_w320: +se_m_grasswhistle: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w320_pri @ Priority - .byte se_w320_rev @ Reverb. + .byte se_m_grasswhistle_pri @ Priority + .byte se_m_grasswhistle_rev @ Reverb. - .word se_w320_grp + .word se_m_grasswhistle_grp - .word se_w320_1 - .word se_w320_2 + .word se_m_grasswhistle_1 + .word se_m_grasswhistle_2 .end diff --git a/sound/songs/se_w258.s b/sound/songs/se_m_hail.s similarity index 69% rename from sound/songs/se_w258.s rename to sound/songs/se_m_hail.s index e2b1a531f7..0c04af2125 100644 --- a/sound/songs/se_w258.s +++ b/sound/songs/se_m_hail.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w258_grp, voicegroup128 - .equ se_w258_pri, 4 - .equ se_w258_rev, reverb_set+50 - .equ se_w258_mvl, 127 - .equ se_w258_key, 0 - .equ se_w258_tbs, 1 - .equ se_w258_exg, 0 - .equ se_w258_cmp, 1 + .equ se_m_hail_grp, voicegroup128 + .equ se_m_hail_pri, 4 + .equ se_m_hail_rev, reverb_set+50 + .equ se_m_hail_mvl, 127 + .equ se_m_hail_key, 0 + .equ se_m_hail_tbs, 1 + .equ se_m_hail_exg, 0 + .equ se_m_hail_cmp, 1 .section .rodata - .global se_w258 + .global se_m_hail .align 2 @********************** Track 1 **********************@ -se_w258_1: - .byte KEYSH , se_w258_key+0 - .byte TEMPO , 150*se_w258_tbs/2 +se_m_hail_1: + .byte KEYSH , se_m_hail_key+0 + .byte TEMPO , 150*se_m_hail_tbs/2 .byte VOICE , 3 - .byte VOL , 100*se_w258_mvl/mxv + .byte VOL , 100*se_m_hail_mvl/mxv .byte PAN , c_v+0 .byte N01 , Fn4 , v112 .byte W04 @@ -57,10 +57,10 @@ se_w258_1: @********************** Track 2 **********************@ -se_w258_2: - .byte KEYSH , se_w258_key+0 +se_m_hail_2: + .byte KEYSH , se_m_hail_key+0 .byte VOICE , 4 - .byte VOL , 100*se_w258_mvl/mxv + .byte VOL , 100*se_m_hail_mvl/mxv .byte PAN , c_v+0 .byte N01 , Dn4 , v040 .byte W04 @@ -84,15 +84,15 @@ se_w258_2: @******************************************************@ .align 2 -se_w258: +se_m_hail: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w258_pri @ Priority - .byte se_w258_rev @ Reverb. + .byte se_m_hail_pri @ Priority + .byte se_m_hail_rev @ Reverb. - .word se_w258_grp + .word se_m_hail_grp - .word se_w258_1 - .word se_w258_2 + .word se_m_hail_1 + .word se_m_hail_2 .end diff --git a/sound/songs/se_w231.s b/sound/songs/se_m_harden.s similarity index 57% rename from sound/songs/se_w231.s rename to sound/songs/se_m_harden.s index 46e5ba9381..e9bd888de8 100644 --- a/sound/songs/se_w231.s +++ b/sound/songs/se_m_harden.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w231_grp, voicegroup128 - .equ se_w231_pri, 4 - .equ se_w231_rev, reverb_set+50 - .equ se_w231_mvl, 127 - .equ se_w231_key, 0 - .equ se_w231_tbs, 1 - .equ se_w231_exg, 0 - .equ se_w231_cmp, 1 + .equ se_m_harden_grp, voicegroup128 + .equ se_m_harden_pri, 4 + .equ se_m_harden_rev, reverb_set+50 + .equ se_m_harden_mvl, 127 + .equ se_m_harden_key, 0 + .equ se_m_harden_tbs, 1 + .equ se_m_harden_exg, 0 + .equ se_m_harden_cmp, 1 .section .rodata - .global se_w231 + .global se_m_harden .align 2 @********************** Track 1 **********************@ -se_w231_1: - .byte KEYSH , se_w231_key+0 - .byte TEMPO , 150*se_w231_tbs/2 +se_m_harden_1: + .byte KEYSH , se_m_harden_key+0 + .byte TEMPO , 150*se_m_harden_tbs/2 .byte VOICE , 28 - .byte VOL , 100*se_w231_mvl/mxv + .byte VOL , 100*se_m_harden_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+16 .byte N03 , Gs3 , v080 @@ -46,10 +46,10 @@ se_w231_1: @********************** Track 2 **********************@ -se_w231_2: - .byte KEYSH , se_w231_key+0 +se_m_harden_2: + .byte KEYSH , se_m_harden_key+0 .byte VOICE , 4 - .byte VOL , 100*se_w231_mvl/mxv + .byte VOL , 100*se_m_harden_mvl/mxv .byte PAN , c_v+0 .byte N01 , En4 , v060 .byte W04 @@ -60,15 +60,15 @@ se_w231_2: @******************************************************@ .align 2 -se_w231: +se_m_harden: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w231_pri @ Priority - .byte se_w231_rev @ Reverb. + .byte se_m_harden_pri @ Priority + .byte se_m_harden_rev @ Reverb. - .word se_w231_grp + .word se_m_harden_grp - .word se_w231_1 - .word se_w231_2 + .word se_m_harden_1 + .word se_m_harden_2 .end diff --git a/sound/songs/se_w114.s b/sound/songs/se_m_haze.s similarity index 53% rename from sound/songs/se_w114.s rename to sound/songs/se_m_haze.s index 4de8c4ed85..4bf61faa69 100644 --- a/sound/songs/se_w114.s +++ b/sound/songs/se_m_haze.s @@ -1,191 +1,191 @@ .include "MPlayDef.s" - .equ se_w114_grp, voicegroup128 - .equ se_w114_pri, 4 - .equ se_w114_rev, reverb_set+50 - .equ se_w114_mvl, 127 - .equ se_w114_key, 0 - .equ se_w114_tbs, 1 - .equ se_w114_exg, 0 - .equ se_w114_cmp, 1 + .equ se_m_haze_grp, voicegroup128 + .equ se_m_haze_pri, 4 + .equ se_m_haze_rev, reverb_set+50 + .equ se_m_haze_mvl, 127 + .equ se_m_haze_key, 0 + .equ se_m_haze_tbs, 1 + .equ se_m_haze_exg, 0 + .equ se_m_haze_cmp, 1 .section .rodata - .global se_w114 + .global se_m_haze .align 2 @********************** Track 1 **********************@ -se_w114_1: - .byte KEYSH , se_w114_key+0 - .byte TEMPO , 190*se_w114_tbs/2 +se_m_haze_1: + .byte KEYSH , se_m_haze_key+0 + .byte TEMPO , 190*se_m_haze_tbs/2 .byte VOICE , 45 .byte BENDR , 8 .byte PAN , c_v-47 - .byte VOL , 10*se_w114_mvl/mxv + .byte VOL , 10*se_m_haze_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte TIE , As2 , v100 .byte W03 - .byte VOL , 14*se_w114_mvl/mxv + .byte VOL , 14*se_m_haze_mvl/mxv .byte W03 - .byte 22*se_w114_mvl/mxv + .byte 22*se_m_haze_mvl/mxv .byte PAN , c_v-45 .byte W02 - .byte VOL , 31*se_w114_mvl/mxv + .byte VOL , 31*se_m_haze_mvl/mxv .byte W02 - .byte 39*se_w114_mvl/mxv + .byte 39*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-43 .byte W02 - .byte VOL , 45*se_w114_mvl/mxv + .byte VOL , 45*se_m_haze_mvl/mxv .byte W02 - .byte 50*se_w114_mvl/mxv + .byte 50*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-41 .byte W01 - .byte VOL , 61*se_w114_mvl/mxv + .byte VOL , 61*se_m_haze_mvl/mxv .byte W02 - .byte 66*se_w114_mvl/mxv + .byte 66*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-39 - .byte VOL , 73*se_w114_mvl/mxv + .byte VOL , 73*se_m_haze_mvl/mxv .byte W02 - .byte 78*se_w114_mvl/mxv + .byte 78*se_m_haze_mvl/mxv .byte W04 - .byte 84*se_w114_mvl/mxv + .byte 84*se_m_haze_mvl/mxv .byte PAN , c_v-37 .byte W03 - .byte VOL , 91*se_w114_mvl/mxv + .byte VOL , 91*se_m_haze_mvl/mxv .byte W03 - .byte 98*se_w114_mvl/mxv + .byte 98*se_m_haze_mvl/mxv .byte PAN , c_v-35 .byte W02 - .byte VOL , 104*se_w114_mvl/mxv + .byte VOL , 104*se_m_haze_mvl/mxv .byte W04 - .byte 110*se_w114_mvl/mxv + .byte 110*se_m_haze_mvl/mxv .byte PAN , c_v-32 .byte W06 .byte c_v-28 .byte W06 .byte c_v-25 - .byte VOL , 106*se_w114_mvl/mxv + .byte VOL , 106*se_m_haze_mvl/mxv .byte W04 - .byte 104*se_w114_mvl/mxv + .byte 104*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-23 .byte W03 - .byte VOL , 101*se_w114_mvl/mxv + .byte VOL , 101*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-20 .byte W03 - .byte VOL , 97*se_w114_mvl/mxv + .byte VOL , 97*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-17 .byte W02 - .byte VOL , 91*se_w114_mvl/mxv + .byte VOL , 91*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v-13 .byte W03 - .byte VOL , 88*se_w114_mvl/mxv + .byte VOL , 88*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte W03 - .byte VOL , 81*se_w114_mvl/mxv + .byte VOL , 81*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-7 .byte W04 - .byte VOL , 75*se_w114_mvl/mxv + .byte VOL , 75*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte W02 - .byte VOL , 74*se_w114_mvl/mxv + .byte VOL , 74*se_m_haze_mvl/mxv .byte W02 - .byte 76*se_w114_mvl/mxv + .byte 76*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W01 - .byte VOL , 79*se_w114_mvl/mxv + .byte VOL , 79*se_m_haze_mvl/mxv .byte W02 - .byte 83*se_w114_mvl/mxv + .byte 83*se_m_haze_mvl/mxv .byte W03 .byte W01 - .byte 86*se_w114_mvl/mxv + .byte 86*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+2 - .byte VOL , 90*se_w114_mvl/mxv + .byte VOL , 90*se_m_haze_mvl/mxv .byte W03 - .byte 95*se_w114_mvl/mxv + .byte 95*se_m_haze_mvl/mxv .byte W03 - .byte 98*se_w114_mvl/mxv + .byte 98*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v+7 - .byte VOL , 102*se_w114_mvl/mxv + .byte VOL , 102*se_m_haze_mvl/mxv .byte W02 - .byte 104*se_w114_mvl/mxv + .byte 104*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v+10 - .byte VOL , 110*se_w114_mvl/mxv + .byte VOL , 110*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+14 .byte W06 .byte c_v+16 .byte W02 - .byte VOL , 106*se_w114_mvl/mxv + .byte VOL , 106*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v+19 .byte W01 - .byte VOL , 100*se_w114_mvl/mxv + .byte VOL , 100*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+22 - .byte VOL , 94*se_w114_mvl/mxv + .byte VOL , 94*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+25 - .byte VOL , 88*se_w114_mvl/mxv + .byte VOL , 88*se_m_haze_mvl/mxv .byte W04 - .byte 83*se_w114_mvl/mxv + .byte 83*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+27 .byte W06 .byte c_v+29 - .byte VOL , 75*se_w114_mvl/mxv + .byte VOL , 75*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+32 - .byte VOL , 64*se_w114_mvl/mxv + .byte VOL , 64*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+34 .byte W01 - .byte VOL , 55*se_w114_mvl/mxv + .byte VOL , 55*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+38 .byte W01 - .byte VOL , 47*se_w114_mvl/mxv + .byte VOL , 47*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+41 .byte W01 - .byte VOL , 41*se_w114_mvl/mxv + .byte VOL , 41*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+44 - .byte VOL , 32*se_w114_mvl/mxv + .byte VOL , 32*se_m_haze_mvl/mxv .byte W03 - .byte 25*se_w114_mvl/mxv + .byte 25*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v+47 .byte W01 - .byte VOL , 12*se_w114_mvl/mxv + .byte VOL , 12*se_m_haze_mvl/mxv .byte W03 - .byte 6*se_w114_mvl/mxv + .byte 6*se_m_haze_mvl/mxv .byte W02 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w114_2: - .byte KEYSH , se_w114_key+0 +se_m_haze_2: + .byte KEYSH , se_m_haze_key+0 .byte VOICE , 70 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 110*se_w114_mvl/mxv + .byte VOL , 110*se_m_haze_mvl/mxv .byte BEND , c_v+0 .byte N24 , Fn4 , v020 .byte W06 @@ -236,15 +236,15 @@ se_w114_2: @******************************************************@ .align 2 -se_w114: +se_m_haze: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w114_pri @ Priority - .byte se_w114_rev @ Reverb. + .byte se_m_haze_pri @ Priority + .byte se_m_haze_rev @ Reverb. - .word se_w114_grp + .word se_m_haze_grp - .word se_w114_1 - .word se_w114_2 + .word se_m_haze_1 + .word se_m_haze_2 .end diff --git a/sound/songs/se_w215.s b/sound/songs/se_m_heal_bell.s similarity index 65% rename from sound/songs/se_w215.s rename to sound/songs/se_m_heal_bell.s index 196686fbd8..b2b17f7d84 100644 --- a/sound/songs/se_w215.s +++ b/sound/songs/se_m_heal_bell.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w215_grp, voicegroup128 - .equ se_w215_pri, 4 - .equ se_w215_rev, reverb_set+50 - .equ se_w215_mvl, 127 - .equ se_w215_key, 0 - .equ se_w215_tbs, 1 - .equ se_w215_exg, 0 - .equ se_w215_cmp, 1 + .equ se_m_heal_bell_grp, voicegroup128 + .equ se_m_heal_bell_pri, 4 + .equ se_m_heal_bell_rev, reverb_set+50 + .equ se_m_heal_bell_mvl, 127 + .equ se_m_heal_bell_key, 0 + .equ se_m_heal_bell_tbs, 1 + .equ se_m_heal_bell_exg, 0 + .equ se_m_heal_bell_cmp, 1 .section .rodata - .global se_w215 + .global se_m_heal_bell .align 2 @********************** Track 1 **********************@ -se_w215_1: - .byte KEYSH , se_w215_key+0 - .byte TEMPO , 150*se_w215_tbs/2 +se_m_heal_bell_1: + .byte KEYSH , se_m_heal_bell_key+0 + .byte TEMPO , 150*se_m_heal_bell_tbs/2 .byte VOICE , 51 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 90*se_w215_mvl/mxv + .byte VOL , 90*se_m_heal_bell_mvl/mxv .byte BEND , c_v+4 .byte N03 , As5 , v100 .byte W01 @@ -70,14 +70,14 @@ se_w215_1: @******************************************************@ .align 2 -se_w215: +se_m_heal_bell: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w215_pri @ Priority - .byte se_w215_rev @ Reverb. + .byte se_m_heal_bell_pri @ Priority + .byte se_m_heal_bell_rev @ Reverb. - .word se_w215_grp + .word se_m_heal_bell_grp - .word se_w215_1 + .word se_m_heal_bell_1 .end diff --git a/sound/songs/se_w257.s b/sound/songs/se_m_heat_wave.s similarity index 55% rename from sound/songs/se_w257.s rename to sound/songs/se_m_heat_wave.s index 5e9b6d06d8..a4b5cc8962 100644 --- a/sound/songs/se_w257.s +++ b/sound/songs/se_m_heat_wave.s @@ -1,60 +1,60 @@ .include "MPlayDef.s" - .equ se_w257_grp, voicegroup128 - .equ se_w257_pri, 4 - .equ se_w257_rev, reverb_set+50 - .equ se_w257_mvl, 127 - .equ se_w257_key, 0 - .equ se_w257_tbs, 1 - .equ se_w257_exg, 0 - .equ se_w257_cmp, 1 + .equ se_m_heat_wave_grp, voicegroup128 + .equ se_m_heat_wave_pri, 4 + .equ se_m_heat_wave_rev, reverb_set+50 + .equ se_m_heat_wave_mvl, 127 + .equ se_m_heat_wave_key, 0 + .equ se_m_heat_wave_tbs, 1 + .equ se_m_heat_wave_exg, 0 + .equ se_m_heat_wave_cmp, 1 .section .rodata - .global se_w257 + .global se_m_heat_wave .align 2 @********************** Track 1 **********************@ -se_w257_1: - .byte KEYSH , se_w257_key+0 - .byte TEMPO , 150*se_w257_tbs/2 +se_m_heat_wave_1: + .byte KEYSH , se_m_heat_wave_key+0 + .byte TEMPO , 150*se_m_heat_wave_tbs/2 .byte VOICE , 29 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 23*se_w257_mvl/mxv + .byte VOL , 23*se_m_heat_wave_mvl/mxv .byte BEND , c_v+0 .byte TIE , Fn4 , v127 .byte W01 - .byte VOL , 51*se_w257_mvl/mxv + .byte VOL , 51*se_m_heat_wave_mvl/mxv .byte W01 - .byte 75*se_w257_mvl/mxv + .byte 75*se_m_heat_wave_mvl/mxv .byte W01 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte BEND , c_v+8 .byte W01 - .byte VOL , 115*se_w257_mvl/mxv + .byte VOL , 115*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte BEND , c_v+16 .byte W01 - .byte VOL , 99*se_w257_mvl/mxv + .byte VOL , 99*se_m_heat_wave_mvl/mxv .byte W02 - .byte 92*se_w257_mvl/mxv + .byte 92*se_m_heat_wave_mvl/mxv .byte BEND , c_v+7 .byte W01 - .byte VOL , 97*se_w257_mvl/mxv + .byte VOL , 97*se_m_heat_wave_mvl/mxv .byte W02 - .byte 105*se_w257_mvl/mxv + .byte 105*se_m_heat_wave_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W03 - .byte VOL , 110*se_w257_mvl/mxv + .byte VOL , 110*se_m_heat_wave_mvl/mxv .byte BEND , c_v-9 .byte W03 .byte PAN , c_v-8 .byte BEND , c_v-24 .byte W03 - .byte VOL , 115*se_w257_mvl/mxv + .byte VOL , 115*se_m_heat_wave_mvl/mxv .byte BEND , c_v-38 .byte W03 .byte PAN , c_v+0 @@ -100,78 +100,78 @@ se_w257_1: .byte BEND , c_v-3 .byte W02 .byte PAN , c_v-8 - .byte VOL , 113*se_w257_mvl/mxv + .byte VOL , 113*se_m_heat_wave_mvl/mxv .byte W04 - .byte 110*se_w257_mvl/mxv + .byte 110*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W02 .byte BEND , c_v-7 .byte W02 - .byte VOL , 105*se_w257_mvl/mxv + .byte VOL , 105*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte W03 - .byte VOL , 98*se_w257_mvl/mxv + .byte VOL , 98*se_m_heat_wave_mvl/mxv .byte BEND , c_v-11 .byte W03 .byte PAN , c_v+0 .byte W01 - .byte VOL , 91*se_w257_mvl/mxv + .byte VOL , 91*se_m_heat_wave_mvl/mxv .byte W03 - .byte 81*se_w257_mvl/mxv + .byte 81*se_m_heat_wave_mvl/mxv .byte BEND , c_v-15 .byte W02 .byte PAN , c_v-8 .byte W02 - .byte VOL , 74*se_w257_mvl/mxv + .byte VOL , 74*se_m_heat_wave_mvl/mxv .byte W01 .byte BEND , c_v-22 .byte W03 .byte PAN , c_v+0 - .byte VOL , 63*se_w257_mvl/mxv + .byte VOL , 63*se_m_heat_wave_mvl/mxv .byte W01 .byte BEND , c_v-30 .byte W01 - .byte VOL , 50*se_w257_mvl/mxv + .byte VOL , 50*se_m_heat_wave_mvl/mxv .byte W02 - .byte 40*se_w257_mvl/mxv + .byte 40*se_m_heat_wave_mvl/mxv .byte BEND , c_v-39 .byte W02 .byte PAN , c_v+6 .byte W01 - .byte VOL , 28*se_w257_mvl/mxv + .byte VOL , 28*se_m_heat_wave_mvl/mxv .byte BEND , c_v-52 .byte W02 - .byte VOL , 17*se_w257_mvl/mxv + .byte VOL , 17*se_m_heat_wave_mvl/mxv .byte W03 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w257_2: - .byte KEYSH , se_w257_key+0 +se_m_heat_wave_2: + .byte KEYSH , se_m_heat_wave_key+0 .byte VOICE , 27 .byte PAN , c_v+0 - .byte VOL , 23*se_w257_mvl/mxv + .byte VOL , 23*se_m_heat_wave_mvl/mxv .byte N30 , Gn2 , v032 .byte W01 - .byte VOL , 51*se_w257_mvl/mxv + .byte VOL , 51*se_m_heat_wave_mvl/mxv .byte W01 - .byte 75*se_w257_mvl/mxv + .byte 75*se_m_heat_wave_mvl/mxv .byte W01 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte W01 - .byte 115*se_w257_mvl/mxv + .byte 115*se_m_heat_wave_mvl/mxv .byte W03 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte W02 - .byte 92*se_w257_mvl/mxv + .byte 92*se_m_heat_wave_mvl/mxv .byte W01 - .byte 97*se_w257_mvl/mxv + .byte 97*se_m_heat_wave_mvl/mxv .byte W02 - .byte 115*se_w257_mvl/mxv + .byte 115*se_m_heat_wave_mvl/mxv .byte W12 .byte PAN , c_v+0 .byte W12 @@ -192,15 +192,15 @@ se_w257_2: @******************************************************@ .align 2 -se_w257: +se_m_heat_wave: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w257_pri @ Priority - .byte se_w257_rev @ Reverb. + .byte se_m_heat_wave_pri @ Priority + .byte se_m_heat_wave_rev @ Reverb. - .word se_w257_grp + .word se_m_heat_wave_grp - .word se_w257_1 - .word se_w257_2 + .word se_m_heat_wave_1 + .word se_m_heat_wave_2 .end diff --git a/sound/songs/se_w056.s b/sound/songs/se_m_hydro_pump.s similarity index 50% rename from sound/songs/se_w056.s rename to sound/songs/se_m_hydro_pump.s index d553f418f9..050f6281be 100644 --- a/sound/songs/se_w056.s +++ b/sound/songs/se_m_hydro_pump.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w056_grp, voicegroup128 - .equ se_w056_pri, 4 - .equ se_w056_rev, reverb_set+50 - .equ se_w056_mvl, 127 - .equ se_w056_key, 0 - .equ se_w056_tbs, 1 - .equ se_w056_exg, 0 - .equ se_w056_cmp, 1 + .equ se_m_hydro_pump_grp, voicegroup128 + .equ se_m_hydro_pump_pri, 4 + .equ se_m_hydro_pump_rev, reverb_set+50 + .equ se_m_hydro_pump_mvl, 127 + .equ se_m_hydro_pump_key, 0 + .equ se_m_hydro_pump_tbs, 1 + .equ se_m_hydro_pump_exg, 0 + .equ se_m_hydro_pump_cmp, 1 .section .rodata - .global se_w056 + .global se_m_hydro_pump .align 2 @********************** Track 1 **********************@ -se_w056_1: - .byte KEYSH , se_w056_key+0 - .byte TEMPO , 150*se_w056_tbs/2 +se_m_hydro_pump_1: + .byte KEYSH , se_m_hydro_pump_key+0 + .byte TEMPO , 150*se_m_hydro_pump_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w056_mvl/mxv + .byte VOL , 115*se_m_hydro_pump_mvl/mxv .byte BEND , c_v+0 .byte TIE , Gn2 , v127 .byte W06 @@ -53,53 +53,53 @@ se_w056_1: .byte W06 .byte c_v+11 .byte W02 - .byte VOL , 103*se_w056_mvl/mxv + .byte VOL , 103*se_m_hydro_pump_mvl/mxv .byte W04 .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w056_mvl/mxv + .byte VOL , 85*se_m_hydro_pump_mvl/mxv .byte W05 .byte PAN , c_v+0 .byte W01 - .byte VOL , 71*se_w056_mvl/mxv + .byte VOL , 71*se_m_hydro_pump_mvl/mxv .byte W05 - .byte 52*se_w056_mvl/mxv + .byte 52*se_m_hydro_pump_mvl/mxv .byte PAN , c_v-4 .byte W04 - .byte VOL , 32*se_w056_mvl/mxv + .byte VOL , 32*se_m_hydro_pump_mvl/mxv .byte W02 .byte PAN , c_v-10 .byte W03 - .byte VOL , 11*se_w056_mvl/mxv + .byte VOL , 11*se_m_hydro_pump_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W01 - .byte VOL , 6*se_w056_mvl/mxv + .byte VOL , 6*se_m_hydro_pump_mvl/mxv .byte W05 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w056_2: - .byte KEYSH , se_w056_key+0 - .byte VOL , 58*se_w056_mvl/mxv +se_m_hydro_pump_2: + .byte KEYSH , se_m_hydro_pump_key+0 + .byte VOL , 58*se_m_hydro_pump_mvl/mxv .byte N14 , Gn3 , v080 .byte W01 .byte VOICE , 25 - .byte VOL , 76*se_w056_mvl/mxv + .byte VOL , 76*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 89*se_w056_mvl/mxv + .byte 89*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 100*se_w056_mvl/mxv + .byte 100*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 115*se_w056_mvl/mxv + .byte 115*se_m_hydro_pump_mvl/mxv .byte W06 - .byte 90*se_w056_mvl/mxv + .byte 90*se_m_hydro_pump_mvl/mxv .byte W02 - .byte 76*se_w056_mvl/mxv + .byte 76*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 58*se_w056_mvl/mxv + .byte 58*se_m_hydro_pump_mvl/mxv .byte W11 .byte W24 .byte W24 @@ -110,15 +110,15 @@ se_w056_2: @******************************************************@ .align 2 -se_w056: +se_m_hydro_pump: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w056_pri @ Priority - .byte se_w056_rev @ Reverb. + .byte se_m_hydro_pump_pri @ Priority + .byte se_m_hydro_pump_rev @ Reverb. - .word se_w056_grp + .word se_m_hydro_pump_grp - .word se_w056_1 - .word se_w056_2 + .word se_m_hydro_pump_1 + .word se_m_hydro_pump_2 .end diff --git a/sound/songs/se_w063.s b/sound/songs/se_m_hyper_beam.s similarity index 55% rename from sound/songs/se_w063.s rename to sound/songs/se_m_hyper_beam.s index e2db381bd5..bce85a21a2 100644 --- a/sound/songs/se_w063.s +++ b/sound/songs/se_m_hyper_beam.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w063_grp, voicegroup128 - .equ se_w063_pri, 4 - .equ se_w063_rev, reverb_set+50 - .equ se_w063_mvl, 127 - .equ se_w063_key, 0 - .equ se_w063_tbs, 1 - .equ se_w063_exg, 0 - .equ se_w063_cmp, 1 + .equ se_m_hyper_beam_grp, voicegroup128 + .equ se_m_hyper_beam_pri, 4 + .equ se_m_hyper_beam_rev, reverb_set+50 + .equ se_m_hyper_beam_mvl, 127 + .equ se_m_hyper_beam_key, 0 + .equ se_m_hyper_beam_tbs, 1 + .equ se_m_hyper_beam_exg, 0 + .equ se_m_hyper_beam_cmp, 1 .section .rodata - .global se_w063 + .global se_m_hyper_beam .align 2 @********************** Track 1 **********************@ -se_w063_1: - .byte KEYSH , se_w063_key+0 - .byte TEMPO , 150*se_w063_tbs/2 +se_m_hyper_beam_1: + .byte KEYSH , se_m_hyper_beam_key+0 + .byte TEMPO , 150*se_m_hyper_beam_tbs/2 .byte VOICE , 18 - .byte VOL , 110*se_w063_mvl/mxv + .byte VOL , 110*se_m_hyper_beam_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -45,10 +45,10 @@ se_w063_1: @********************** Track 2 **********************@ -se_w063_2: - .byte KEYSH , se_w063_key+0 +se_m_hyper_beam_2: + .byte KEYSH , se_m_hyper_beam_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w063_mvl/mxv + .byte VOL , 110*se_m_hyper_beam_mvl/mxv .byte N01 , Cn3 , v040 .byte W02 .byte N01 @@ -57,28 +57,28 @@ se_w063_2: .byte W02 .byte N01 .byte W04 -se_w063_2_000: +se_m_hyper_beam_2_000: .byte N01 , Cn3 , v020 .byte W02 .byte N01 .byte W04 .byte PEND .byte PATT - .word se_w063_2_000 + .word se_m_hyper_beam_2_000 .byte FINE @******************************************************@ .align 2 -se_w063: +se_m_hyper_beam: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w063_pri @ Priority - .byte se_w063_rev @ Reverb. + .byte se_m_hyper_beam_pri @ Priority + .byte se_m_hyper_beam_rev @ Reverb. - .word se_w063_grp + .word se_m_hyper_beam_grp - .word se_w063_1 - .word se_w063_2 + .word se_m_hyper_beam_1 + .word se_m_hyper_beam_2 .end diff --git a/sound/songs/se_w063b.s b/sound/songs/se_m_hyper_beam2.s similarity index 66% rename from sound/songs/se_w063b.s rename to sound/songs/se_m_hyper_beam2.s index eef2578492..304fa7b3f2 100644 --- a/sound/songs/se_w063b.s +++ b/sound/songs/se_m_hyper_beam2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w063b_grp, voicegroup128 - .equ se_w063b_pri, 4 - .equ se_w063b_rev, reverb_set+50 - .equ se_w063b_mvl, 127 - .equ se_w063b_key, 0 - .equ se_w063b_tbs, 1 - .equ se_w063b_exg, 0 - .equ se_w063b_cmp, 1 + .equ se_m_hyper_beam2_grp, voicegroup128 + .equ se_m_hyper_beam2_pri, 4 + .equ se_m_hyper_beam2_rev, reverb_set+50 + .equ se_m_hyper_beam2_mvl, 127 + .equ se_m_hyper_beam2_key, 0 + .equ se_m_hyper_beam2_tbs, 1 + .equ se_m_hyper_beam2_exg, 0 + .equ se_m_hyper_beam2_cmp, 1 .section .rodata - .global se_w063b + .global se_m_hyper_beam2 .align 2 @********************** Track 1 **********************@ -se_w063b_1: - .byte KEYSH , se_w063b_key+0 - .byte TEMPO , 150*se_w063b_tbs/2 +se_m_hyper_beam2_1: + .byte KEYSH , se_m_hyper_beam2_key+0 + .byte TEMPO , 150*se_m_hyper_beam2_tbs/2 .byte VOICE , 45 - .byte VOL , 110*se_w063b_mvl/mxv + .byte VOL , 110*se_m_hyper_beam2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -76,10 +76,10 @@ se_w063b_1: @********************** Track 2 **********************@ -se_w063b_2: - .byte KEYSH , se_w063b_key+0 +se_m_hyper_beam2_2: + .byte KEYSH , se_m_hyper_beam2_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w063b_mvl/mxv + .byte VOL , 110*se_m_hyper_beam2_mvl/mxv .byte N01 , Cn3 , v032 .byte W02 .byte N01 @@ -88,28 +88,28 @@ se_w063b_2: .byte W02 .byte N01 .byte W04 -se_w063b_2_000: +se_m_hyper_beam2_2_000: .byte N01 , Cn3 , v020 .byte W02 .byte N01 .byte W04 .byte PEND .byte PATT - .word se_w063b_2_000 + .word se_m_hyper_beam2_2_000 .byte FINE @******************************************************@ .align 2 -se_w063b: +se_m_hyper_beam2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w063b_pri @ Priority - .byte se_w063b_rev @ Reverb. + .byte se_m_hyper_beam2_pri @ Priority + .byte se_m_hyper_beam2_rev @ Reverb. - .word se_w063b_grp + .word se_m_hyper_beam2_grp - .word se_w063b_1 - .word se_w063b_2 + .word se_m_hyper_beam2_1 + .word se_m_hyper_beam2_2 .end diff --git a/sound/songs/se_w196.s b/sound/songs/se_m_icy_wind.s similarity index 55% rename from sound/songs/se_w196.s rename to sound/songs/se_m_icy_wind.s index 8a47a8c1be..d15350525e 100644 --- a/sound/songs/se_w196.s +++ b/sound/songs/se_m_icy_wind.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w196_grp, voicegroup128 - .equ se_w196_pri, 4 - .equ se_w196_rev, reverb_set+50 - .equ se_w196_mvl, 127 - .equ se_w196_key, 0 - .equ se_w196_tbs, 1 - .equ se_w196_exg, 0 - .equ se_w196_cmp, 1 + .equ se_m_icy_wind_grp, voicegroup128 + .equ se_m_icy_wind_pri, 4 + .equ se_m_icy_wind_rev, reverb_set+50 + .equ se_m_icy_wind_mvl, 127 + .equ se_m_icy_wind_key, 0 + .equ se_m_icy_wind_tbs, 1 + .equ se_m_icy_wind_exg, 0 + .equ se_m_icy_wind_cmp, 1 .section .rodata - .global se_w196 + .global se_m_icy_wind .align 2 @********************** Track 1 **********************@ -se_w196_1: - .byte KEYSH , se_w196_key+0 - .byte TEMPO , 150*se_w196_tbs/2 +se_m_icy_wind_1: + .byte KEYSH , se_m_icy_wind_key+0 + .byte TEMPO , 150*se_m_icy_wind_tbs/2 .byte VOICE , 3 - .byte VOL , 100*se_w196_mvl/mxv + .byte VOL , 100*se_m_icy_wind_mvl/mxv .byte PAN , c_v+0 .byte N01 , Ds4 , v112 .byte W04 @@ -36,10 +36,10 @@ se_w196_1: @********************** Track 2 **********************@ -se_w196_2: - .byte KEYSH , se_w196_key+0 +se_m_icy_wind_2: + .byte KEYSH , se_m_icy_wind_key+0 .byte VOICE , 5 - .byte VOL , 100*se_w196_mvl/mxv + .byte VOL , 100*se_m_icy_wind_mvl/mxv .byte PAN , c_v+0 .byte N01 , Dn4 , v040 .byte W04 @@ -58,15 +58,15 @@ se_w196_2: @******************************************************@ .align 2 -se_w196: +se_m_icy_wind: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w196_pri @ Priority - .byte se_w196_rev @ Reverb. + .byte se_m_icy_wind_pri @ Priority + .byte se_m_icy_wind_rev @ Reverb. - .word se_w196_grp + .word se_m_icy_wind_grp - .word se_w196_1 - .word se_w196_2 + .word se_m_icy_wind_1 + .word se_m_icy_wind_2 .end diff --git a/sound/songs/se_w122.s b/sound/songs/se_m_lick.s similarity index 70% rename from sound/songs/se_w122.s rename to sound/songs/se_m_lick.s index 95eb26ead4..1aa0c35a28 100644 --- a/sound/songs/se_w122.s +++ b/sound/songs/se_m_lick.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w122_grp, voicegroup128 - .equ se_w122_pri, 4 - .equ se_w122_rev, reverb_set+50 - .equ se_w122_mvl, 127 - .equ se_w122_key, 0 - .equ se_w122_tbs, 1 - .equ se_w122_exg, 0 - .equ se_w122_cmp, 1 + .equ se_m_lick_grp, voicegroup128 + .equ se_m_lick_pri, 4 + .equ se_m_lick_rev, reverb_set+50 + .equ se_m_lick_mvl, 127 + .equ se_m_lick_key, 0 + .equ se_m_lick_tbs, 1 + .equ se_m_lick_exg, 0 + .equ se_m_lick_cmp, 1 .section .rodata - .global se_w122 + .global se_m_lick .align 2 @********************** Track 1 **********************@ -se_w122_1: - .byte KEYSH , se_w122_key+0 - .byte TEMPO , 150*se_w122_tbs/2 +se_m_lick_1: + .byte KEYSH , se_m_lick_key+0 + .byte TEMPO , 150*se_m_lick_tbs/2 .byte VOICE , 31 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w122_mvl/mxv + .byte VOL , 110*se_m_lick_mvl/mxv .byte BEND , c_v-5 .byte N32 , Cn3 , v127 .byte W01 @@ -68,47 +68,47 @@ se_w122_1: .byte BEND , c_v+16 .byte W02 .byte PAN , c_v-4 - .byte VOL , 102*se_w122_mvl/mxv + .byte VOL , 102*se_m_lick_mvl/mxv .byte BEND , c_v+12 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+16 .byte W01 .byte PAN , c_v+4 - .byte VOL , 97*se_w122_mvl/mxv + .byte VOL , 97*se_m_lick_mvl/mxv .byte BEND , c_v+18 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+14 .byte W01 .byte PAN , c_v-4 - .byte VOL , 92*se_w122_mvl/mxv + .byte VOL , 92*se_m_lick_mvl/mxv .byte BEND , c_v+18 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+20 .byte W01 .byte PAN , c_v+4 - .byte VOL , 88*se_w122_mvl/mxv + .byte VOL , 88*se_m_lick_mvl/mxv .byte BEND , c_v+17 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+12 .byte W01 .byte PAN , c_v-4 - .byte VOL , 81*se_w122_mvl/mxv + .byte VOL , 81*se_m_lick_mvl/mxv .byte BEND , c_v+16 .byte W01 .byte PAN , c_v+0 - .byte VOL , 64*se_w122_mvl/mxv + .byte VOL , 64*se_m_lick_mvl/mxv .byte BEND , c_v+12 .byte W02 .byte PAN , c_v+4 - .byte VOL , 49*se_w122_mvl/mxv + .byte VOL , 49*se_m_lick_mvl/mxv .byte BEND , c_v+14 .byte W01 .byte PAN , c_v+0 - .byte VOL , 25*se_w122_mvl/mxv + .byte VOL , 25*se_m_lick_mvl/mxv .byte BEND , c_v+11 .byte W05 .byte FINE @@ -116,14 +116,14 @@ se_w122_1: @******************************************************@ .align 2 -se_w122: +se_m_lick: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w122_pri @ Priority - .byte se_w122_rev @ Reverb. + .byte se_m_lick_pri @ Priority + .byte se_m_lick_rev @ Reverb. - .word se_w122_grp + .word se_m_lick_grp - .word se_w122_1 + .word se_m_lick_1 .end diff --git a/sound/songs/se_w199.s b/sound/songs/se_m_lock_on.s similarity index 62% rename from sound/songs/se_w199.s rename to sound/songs/se_m_lock_on.s index 26ffc82b75..d8e1de5b0f 100644 --- a/sound/songs/se_w199.s +++ b/sound/songs/se_m_lock_on.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w199_grp, voicegroup128 - .equ se_w199_pri, 4 - .equ se_w199_rev, reverb_set+50 - .equ se_w199_mvl, 127 - .equ se_w199_key, 0 - .equ se_w199_tbs, 1 - .equ se_w199_exg, 0 - .equ se_w199_cmp, 1 + .equ se_m_lock_on_grp, voicegroup128 + .equ se_m_lock_on_pri, 4 + .equ se_m_lock_on_rev, reverb_set+50 + .equ se_m_lock_on_mvl, 127 + .equ se_m_lock_on_key, 0 + .equ se_m_lock_on_tbs, 1 + .equ se_m_lock_on_exg, 0 + .equ se_m_lock_on_cmp, 1 .section .rodata - .global se_w199 + .global se_m_lock_on .align 2 @********************** Track 1 **********************@ -se_w199_1: - .byte KEYSH , se_w199_key+0 - .byte TEMPO , 150*se_w199_tbs/2 +se_m_lock_on_1: + .byte KEYSH , se_m_lock_on_key+0 + .byte TEMPO , 150*se_m_lock_on_tbs/2 .byte VOICE , 40 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w199_mvl/mxv + .byte VOL , 110*se_m_lock_on_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn4 , v100 .byte W01 @@ -56,14 +56,14 @@ se_w199_1: @******************************************************@ .align 2 -se_w199: +se_m_lock_on: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w199_pri @ Priority - .byte se_w199_rev @ Reverb. + .byte se_m_lock_on_pri @ Priority + .byte se_m_lock_on_rev @ Reverb. - .word se_w199_grp + .word se_m_lock_on_grp - .word se_w199_1 + .word se_m_lock_on_1 .end diff --git a/sound/songs/se_w118.s b/sound/songs/se_m_metronome.s similarity index 65% rename from sound/songs/se_w118.s rename to sound/songs/se_m_metronome.s index 3c4d1404c8..ba0a55d8b9 100644 --- a/sound/songs/se_w118.s +++ b/sound/songs/se_m_metronome.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w118_grp, voicegroup128 - .equ se_w118_pri, 4 - .equ se_w118_rev, reverb_set+50 - .equ se_w118_mvl, 127 - .equ se_w118_key, 0 - .equ se_w118_tbs, 1 - .equ se_w118_exg, 0 - .equ se_w118_cmp, 1 + .equ se_m_metronome_grp, voicegroup128 + .equ se_m_metronome_pri, 4 + .equ se_m_metronome_rev, reverb_set+50 + .equ se_m_metronome_mvl, 127 + .equ se_m_metronome_key, 0 + .equ se_m_metronome_tbs, 1 + .equ se_m_metronome_exg, 0 + .equ se_m_metronome_cmp, 1 .section .rodata - .global se_w118 + .global se_m_metronome .align 2 @********************** Track 1 **********************@ -se_w118_1: - .byte KEYSH , se_w118_key+0 - .byte TEMPO , 150*se_w118_tbs/2 +se_m_metronome_1: + .byte KEYSH , se_m_metronome_key+0 + .byte TEMPO , 150*se_m_metronome_tbs/2 .byte VOICE , 37 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w118_mvl/mxv + .byte VOL , 115*se_m_metronome_mvl/mxv .byte BEND , c_v+0 .byte N15 , En3 , v127 .byte W01 @@ -66,14 +66,14 @@ se_w118_1: @******************************************************@ .align 2 -se_w118: +se_m_metronome: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w118_pri @ Priority - .byte se_w118_rev @ Reverb. + .byte se_m_metronome_pri @ Priority + .byte se_m_metronome_rev @ Reverb. - .word se_w118_grp + .word se_m_metronome_grp - .word se_w118_1 + .word se_m_metronome_1 .end diff --git a/sound/songs/se_w208.s b/sound/songs/se_m_milk_drink.s similarity index 58% rename from sound/songs/se_w208.s rename to sound/songs/se_m_milk_drink.s index b26ce23d7d..30a051540c 100644 --- a/sound/songs/se_w208.s +++ b/sound/songs/se_m_milk_drink.s @@ -1,42 +1,42 @@ .include "MPlayDef.s" - .equ se_w208_grp, voicegroup128 - .equ se_w208_pri, 4 - .equ se_w208_rev, reverb_set+50 - .equ se_w208_mvl, 127 - .equ se_w208_key, 0 - .equ se_w208_tbs, 1 - .equ se_w208_exg, 0 - .equ se_w208_cmp, 1 + .equ se_m_milk_drink_grp, voicegroup128 + .equ se_m_milk_drink_pri, 4 + .equ se_m_milk_drink_rev, reverb_set+50 + .equ se_m_milk_drink_mvl, 127 + .equ se_m_milk_drink_key, 0 + .equ se_m_milk_drink_tbs, 1 + .equ se_m_milk_drink_exg, 0 + .equ se_m_milk_drink_cmp, 1 .section .rodata - .global se_w208 + .global se_m_milk_drink .align 2 @********************** Track 1 **********************@ -se_w208_1: - .byte KEYSH , se_w208_key+0 - .byte TEMPO , 180*se_w208_tbs/2 +se_m_milk_drink_1: + .byte KEYSH , se_m_milk_drink_key+0 + .byte TEMPO , 180*se_m_milk_drink_tbs/2 .byte VOICE , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v100 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W02 .byte N02 , An6 , v056 @@ -44,7 +44,7 @@ se_w208_1: .byte PAN , c_v+5 .byte W01 .byte c_v-6 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v100 .byte W01 @@ -52,15 +52,15 @@ se_w208_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-10 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W02 .byte PAN , c_v+1 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+5 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W01 .byte PAN , c_v-6 @@ -69,7 +69,7 @@ se_w208_1: .byte PAN , c_v+8 .byte W01 .byte c_v-10 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v072 .byte W02 @@ -77,15 +77,15 @@ se_w208_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+8 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W01 .byte PAN , c_v-10 @@ -95,10 +95,10 @@ se_w208_1: @********************** Track 2 **********************@ -se_w208_2: - .byte KEYSH , se_w208_key+0 +se_m_milk_drink_2: + .byte KEYSH , se_m_milk_drink_key+0 .byte VOICE , 53 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte W02 .byte N06 , Fs6 , v040 .byte W04 @@ -115,15 +115,15 @@ se_w208_2: @******************************************************@ .align 2 -se_w208: +se_m_milk_drink: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w208_pri @ Priority - .byte se_w208_rev @ Reverb. + .byte se_m_milk_drink_pri @ Priority + .byte se_m_milk_drink_rev @ Reverb. - .word se_w208_grp + .word se_m_milk_drink_grp - .word se_w208_1 - .word se_w208_2 + .word se_m_milk_drink_1 + .word se_m_milk_drink_2 .end diff --git a/sound/songs/se_w107.s b/sound/songs/se_m_minimize.s similarity index 73% rename from sound/songs/se_w107.s rename to sound/songs/se_m_minimize.s index da7bc3d392..565450b2b4 100644 --- a/sound/songs/se_w107.s +++ b/sound/songs/se_m_minimize.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w107_grp, voicegroup128 - .equ se_w107_pri, 4 - .equ se_w107_rev, reverb_set+50 - .equ se_w107_mvl, 127 - .equ se_w107_key, 0 - .equ se_w107_tbs, 1 - .equ se_w107_exg, 0 - .equ se_w107_cmp, 1 + .equ se_m_minimize_grp, voicegroup128 + .equ se_m_minimize_pri, 4 + .equ se_m_minimize_rev, reverb_set+50 + .equ se_m_minimize_mvl, 127 + .equ se_m_minimize_key, 0 + .equ se_m_minimize_tbs, 1 + .equ se_m_minimize_exg, 0 + .equ se_m_minimize_cmp, 1 .section .rodata - .global se_w107 + .global se_m_minimize .align 2 @********************** Track 1 **********************@ -se_w107_1: - .byte KEYSH , se_w107_key+0 - .byte TEMPO , 150*se_w107_tbs/2 +se_m_minimize_1: + .byte KEYSH , se_m_minimize_key+0 + .byte TEMPO , 150*se_m_minimize_tbs/2 .byte VOICE , 45 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 32*se_w107_mvl/mxv + .byte VOL , 32*se_m_minimize_mvl/mxv .byte MOD , 30 .byte BEND , c_v+39 .byte N06 , Dn4 , v127 .byte W01 .byte BEND , c_v+31 .byte W01 - .byte VOL , 49*se_w107_mvl/mxv + .byte VOL , 49*se_m_minimize_mvl/mxv .byte PAN , c_v+5 .byte BEND , c_v+23 .byte W01 .byte c_v+15 .byte W01 - .byte VOL , 61*se_w107_mvl/mxv + .byte VOL , 61*se_m_minimize_mvl/mxv .byte BEND , c_v+8 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+35 .byte N06 , Cn4 , v116 .byte W01 - .byte VOL , 71*se_w107_mvl/mxv + .byte VOL , 71*se_m_minimize_mvl/mxv .byte BEND , c_v+27 .byte W01 .byte PAN , c_v-4 .byte BEND , c_v+19 .byte W01 - .byte VOL , 81*se_w107_mvl/mxv + .byte VOL , 81*se_m_minimize_mvl/mxv .byte BEND , c_v+12 .byte W01 .byte c_v+5 .byte W02 - .byte VOL , 95*se_w107_mvl/mxv + .byte VOL , 95*se_m_minimize_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+32 .byte N06 , Bn3 , v112 @@ -92,20 +92,20 @@ se_w107_1: .byte W01 .byte c_v-6 .byte W02 - .byte VOL , 82*se_w107_mvl/mxv + .byte VOL , 82*se_m_minimize_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+21 .byte N06 , Fn3 , v100 .byte W01 .byte BEND , c_v+13 .byte W01 - .byte VOL , 71*se_w107_mvl/mxv + .byte VOL , 71*se_m_minimize_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+5 .byte W01 .byte c_v-2 .byte W01 - .byte VOL , 61*se_w107_mvl/mxv + .byte VOL , 61*se_m_minimize_mvl/mxv .byte BEND , c_v-10 .byte W02 .byte PAN , c_v+0 @@ -152,14 +152,14 @@ se_w107_1: @******************************************************@ .align 2 -se_w107: +se_m_minimize: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w107_pri @ Priority - .byte se_w107_rev @ Reverb. + .byte se_m_minimize_pri @ Priority + .byte se_m_minimize_rev @ Reverb. - .word se_w107_grp + .word se_m_minimize_grp - .word se_w107_1 + .word se_m_minimize_1 .end diff --git a/sound/songs/se_w054.s b/sound/songs/se_m_mist.s similarity index 54% rename from sound/songs/se_w054.s rename to sound/songs/se_m_mist.s index 712dc33386..f46eb130a6 100644 --- a/sound/songs/se_w054.s +++ b/sound/songs/se_m_mist.s @@ -1,48 +1,48 @@ .include "MPlayDef.s" - .equ se_w054_grp, voicegroup128 - .equ se_w054_pri, 4 - .equ se_w054_rev, reverb_set+50 - .equ se_w054_mvl, 127 - .equ se_w054_key, 0 - .equ se_w054_tbs, 1 - .equ se_w054_exg, 0 - .equ se_w054_cmp, 1 + .equ se_m_mist_grp, voicegroup128 + .equ se_m_mist_pri, 4 + .equ se_m_mist_rev, reverb_set+50 + .equ se_m_mist_mvl, 127 + .equ se_m_mist_key, 0 + .equ se_m_mist_tbs, 1 + .equ se_m_mist_exg, 0 + .equ se_m_mist_cmp, 1 .section .rodata - .global se_w054 + .global se_m_mist .align 2 @********************** Track 1 **********************@ -se_w054_1: - .byte KEYSH , se_w054_key+0 - .byte TEMPO , 150*se_w054_tbs/2 +se_m_mist_1: + .byte KEYSH , se_m_mist_key+0 + .byte TEMPO , 150*se_m_mist_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 7*se_w054_mvl/mxv + .byte VOL , 7*se_m_mist_mvl/mxv .byte BEND , c_v+1 .byte N18 , Cn5 , v052 .byte W01 - .byte VOL , 20*se_w054_mvl/mxv + .byte VOL , 20*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-8 .byte W01 - .byte VOL , 41*se_w054_mvl/mxv + .byte VOL , 41*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v-16 .byte W01 - .byte VOL , 70*se_w054_mvl/mxv + .byte VOL , 70*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-8 .byte W01 - .byte VOL , 93*se_w054_mvl/mxv + .byte VOL , 93*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v+0 .byte W02 .byte PAN , c_v+0 - .byte VOL , 110*se_w054_mvl/mxv + .byte VOL , 110*se_m_mist_mvl/mxv .byte BEND , c_v+8 .byte W01 .byte PAN , c_v+16 @@ -50,30 +50,30 @@ se_w054_1: .byte W01 .byte PAN , c_v-14 .byte W01 - .byte VOL , 98*se_w054_mvl/mxv + .byte VOL , 98*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v+10 .byte W01 - .byte VOL , 85*se_w054_mvl/mxv + .byte VOL , 85*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v+4 .byte W02 - .byte VOL , 69*se_w054_mvl/mxv + .byte VOL , 69*se_m_mist_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-7 .byte W01 - .byte VOL , 51*se_w054_mvl/mxv + .byte VOL , 51*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-22 .byte W01 .byte PAN , c_v-14 - .byte VOL , 38*se_w054_mvl/mxv + .byte VOL , 38*se_m_mist_mvl/mxv .byte BEND , c_v-28 .byte W01 - .byte VOL , 17*se_w054_mvl/mxv + .byte VOL , 17*se_m_mist_mvl/mxv .byte BEND , c_v-32 .byte W01 - .byte VOL , 4*se_w054_mvl/mxv + .byte VOL , 4*se_m_mist_mvl/mxv .byte BEND , c_v-38 .byte W08 .byte FINE @@ -81,14 +81,14 @@ se_w054_1: @******************************************************@ .align 2 -se_w054: +se_m_mist: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w054_pri @ Priority - .byte se_w054_rev @ Reverb. + .byte se_m_mist_pri @ Priority + .byte se_m_mist_rev @ Reverb. - .word se_w054_grp + .word se_m_mist_grp - .word se_w054_1 + .word se_m_mist_1 .end diff --git a/sound/songs/se_w236.s b/sound/songs/se_m_moonlight.s similarity index 73% rename from sound/songs/se_w236.s rename to sound/songs/se_m_moonlight.s index c3bb3d90fd..bd4410b323 100644 --- a/sound/songs/se_w236.s +++ b/sound/songs/se_m_moonlight.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w236_grp, voicegroup128 - .equ se_w236_pri, 4 - .equ se_w236_rev, reverb_set+50 - .equ se_w236_mvl, 127 - .equ se_w236_key, 0 - .equ se_w236_tbs, 1 - .equ se_w236_exg, 0 - .equ se_w236_cmp, 1 + .equ se_m_moonlight_grp, voicegroup128 + .equ se_m_moonlight_pri, 4 + .equ se_m_moonlight_rev, reverb_set+50 + .equ se_m_moonlight_mvl, 127 + .equ se_m_moonlight_key, 0 + .equ se_m_moonlight_tbs, 1 + .equ se_m_moonlight_exg, 0 + .equ se_m_moonlight_cmp, 1 .section .rodata - .global se_w236 + .global se_m_moonlight .align 2 @********************** Track 1 **********************@ -se_w236_1: - .byte KEYSH , se_w236_key+0 - .byte TEMPO , 150*se_w236_tbs/2 +se_m_moonlight_1: + .byte KEYSH , se_m_moonlight_key+0 + .byte TEMPO , 150*se_m_moonlight_tbs/2 .byte VOICE , 46 - .byte VOL , 100*se_w236_mvl/mxv + .byte VOL , 100*se_m_moonlight_mvl/mxv .byte BENDR , 4 .byte PAN , c_v+0 .byte MOD , 6 @@ -32,7 +32,7 @@ se_w236_1: .byte W01 .byte N20 , Gn6 , v100 .byte W21 -se_w236_1_000: +se_m_moonlight_1_000: .byte N01 , Ds6 , v056 .byte W01 .byte Dn6 @@ -50,7 +50,7 @@ se_w236_1_000: .byte c_v-4 .byte W04 .byte PEND -se_w236_1_001: +se_m_moonlight_1_001: .byte PAN , c_v+0 .byte N01 , Gs5 , v092 .byte W01 @@ -61,7 +61,7 @@ se_w236_1_001: .byte N20 , Cn6 , v100 .byte W21 .byte PEND -se_w236_1_002: +se_m_moonlight_1_002: .byte PAN , c_v+16 .byte N01 , Gs5 , v056 .byte W01 @@ -72,7 +72,7 @@ se_w236_1_002: .byte N20 , Cn6 , v064 .byte W21 .byte PEND -se_w236_1_003: +se_m_moonlight_1_003: .byte PAN , c_v-16 .byte N01 , Gs5 , v040 .byte W01 @@ -83,7 +83,7 @@ se_w236_1_003: .byte N20 , Cn6 .byte W21 .byte PEND -se_w236_1_004: +se_m_moonlight_1_004: .byte PAN , c_v+32 .byte N01 , Gs5 , v020 .byte W01 @@ -105,24 +105,24 @@ se_w236_1_004: .byte N20 , Gn6 , v100 .byte W21 .byte PATT - .word se_w236_1_000 + .word se_m_moonlight_1_000 .byte PATT - .word se_w236_1_001 + .word se_m_moonlight_1_001 .byte PATT - .word se_w236_1_002 + .word se_m_moonlight_1_002 .byte PATT - .word se_w236_1_003 + .word se_m_moonlight_1_003 .byte PATT - .word se_w236_1_004 + .word se_m_moonlight_1_004 .byte FINE @********************** Track 2 **********************@ -se_w236_2: - .byte KEYSH , se_w236_key+0 +se_m_moonlight_2: + .byte KEYSH , se_m_moonlight_key+0 .byte VOICE , 55 .byte PAN , c_v+0 - .byte VOL , 39*se_w236_mvl/mxv + .byte VOL , 39*se_m_moonlight_mvl/mxv .byte BEND , c_v-4 .byte W10 .byte N01 , Ds6 , v112 @@ -135,7 +135,7 @@ se_w236_2: .byte W05 .byte Gn6 , v096 .byte W05 -se_w236_2_000: +se_m_moonlight_2_000: .byte PAN , c_v+50 .byte N04 , Gn6 , v080 .byte W04 @@ -149,7 +149,7 @@ se_w236_2_000: .byte N04 , Gn6 , v032 .byte W10 .byte PEND -se_w236_2_001: +se_m_moonlight_2_001: .byte PAN , c_v+0 .byte W10 .byte N01 , Gs5 , v112 @@ -163,7 +163,7 @@ se_w236_2_001: .byte Cn6 , v096 .byte W05 .byte PEND -se_w236_2_002: +se_m_moonlight_2_002: .byte PAN , c_v+50 .byte N04 , Cn6 , v080 .byte W04 @@ -192,11 +192,11 @@ se_w236_2_002: .byte Gn6 , v096 .byte W05 .byte PATT - .word se_w236_2_000 + .word se_m_moonlight_2_000 .byte PATT - .word se_w236_2_001 + .word se_m_moonlight_2_001 .byte PATT - .word se_w236_2_002 + .word se_m_moonlight_2_002 .byte W24 .byte W24 .byte FINE @@ -204,15 +204,15 @@ se_w236_2_002: @******************************************************@ .align 2 -se_w236: +se_m_moonlight: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w236_pri @ Priority - .byte se_w236_rev @ Reverb. + .byte se_m_moonlight_pri @ Priority + .byte se_m_moonlight_rev @ Reverb. - .word se_w236_grp + .word se_m_moonlight_grp - .word se_w236_1 - .word se_w236_2 + .word se_m_moonlight_1 + .word se_m_moonlight_2 .end diff --git a/sound/songs/se_w234.s b/sound/songs/se_m_morning_sun.s similarity index 72% rename from sound/songs/se_w234.s rename to sound/songs/se_m_morning_sun.s index 4f07ef30a7..ac7667246f 100644 --- a/sound/songs/se_w234.s +++ b/sound/songs/se_m_morning_sun.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w234_grp, voicegroup128 - .equ se_w234_pri, 5 - .equ se_w234_rev, reverb_set+50 - .equ se_w234_mvl, 127 - .equ se_w234_key, 0 - .equ se_w234_tbs, 1 - .equ se_w234_exg, 0 - .equ se_w234_cmp, 1 + .equ se_m_morning_sun_grp, voicegroup128 + .equ se_m_morning_sun_pri, 5 + .equ se_m_morning_sun_rev, reverb_set+50 + .equ se_m_morning_sun_mvl, 127 + .equ se_m_morning_sun_key, 0 + .equ se_m_morning_sun_tbs, 1 + .equ se_m_morning_sun_exg, 0 + .equ se_m_morning_sun_cmp, 1 .section .rodata - .global se_w234 + .global se_m_morning_sun .align 2 @********************** Track 1 **********************@ -se_w234_1: - .byte KEYSH , se_w234_key+0 - .byte TEMPO , 150*se_w234_tbs/2 +se_m_morning_sun_1: + .byte KEYSH , se_m_morning_sun_key+0 + .byte TEMPO , 150*se_m_morning_sun_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w234_mvl/mxv + .byte VOL , 95*se_m_morning_sun_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -72,11 +72,11 @@ se_w234_1: @********************** Track 2 **********************@ -se_w234_2: - .byte KEYSH , se_w234_key+0 +se_m_morning_sun_2: + .byte KEYSH , se_m_morning_sun_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w234_mvl/mxv + .byte VOL , 43*se_m_morning_sun_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , Gs6 , v108 @@ -121,15 +121,15 @@ se_w234_2: @******************************************************@ .align 2 -se_w234: +se_m_morning_sun: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w234_pri @ Priority - .byte se_w234_rev @ Reverb. + .byte se_m_morning_sun_pri @ Priority + .byte se_m_morning_sun_rev @ Reverb. - .word se_w234_grp + .word se_m_morning_sun_grp - .word se_w234_1 - .word se_w234_2 + .word se_m_morning_sun_1 + .word se_m_morning_sun_2 .end diff --git a/sound/songs/se_w171.s b/sound/songs/se_m_nightmare.s similarity index 76% rename from sound/songs/se_w171.s rename to sound/songs/se_m_nightmare.s index a953faa50e..825bfaea20 100644 --- a/sound/songs/se_w171.s +++ b/sound/songs/se_m_nightmare.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w171_grp, voicegroup128 - .equ se_w171_pri, 4 - .equ se_w171_rev, reverb_set+50 - .equ se_w171_mvl, 127 - .equ se_w171_key, 0 - .equ se_w171_tbs, 1 - .equ se_w171_exg, 0 - .equ se_w171_cmp, 1 + .equ se_m_nightmare_grp, voicegroup128 + .equ se_m_nightmare_pri, 4 + .equ se_m_nightmare_rev, reverb_set+50 + .equ se_m_nightmare_mvl, 127 + .equ se_m_nightmare_key, 0 + .equ se_m_nightmare_tbs, 1 + .equ se_m_nightmare_exg, 0 + .equ se_m_nightmare_cmp, 1 .section .rodata - .global se_w171 + .global se_m_nightmare .align 2 @********************** Track 1 **********************@ -se_w171_1: - .byte KEYSH , se_w171_key+0 - .byte TEMPO , 220*se_w171_tbs/2 +se_m_nightmare_1: + .byte KEYSH , se_m_nightmare_key+0 + .byte TEMPO , 220*se_m_nightmare_tbs/2 .byte VOICE , 3 - .byte VOL , 110*se_w171_mvl/mxv + .byte VOL , 110*se_m_nightmare_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -65,12 +65,12 @@ se_w171_1: @********************** Track 2 **********************@ -se_w171_2: - .byte KEYSH , se_w171_key+0 +se_m_nightmare_2: + .byte KEYSH , se_m_nightmare_key+0 .byte VOICE , 20 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w171_mvl/mxv + .byte VOL , 110*se_m_nightmare_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v+55 .byte N03 , Cn2 , v100 @@ -132,15 +132,15 @@ se_w171_2: @******************************************************@ .align 2 -se_w171: +se_m_nightmare: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w171_pri @ Priority - .byte se_w171_rev @ Reverb. + .byte se_m_nightmare_pri @ Priority + .byte se_m_nightmare_rev @ Reverb. - .word se_w171_grp + .word se_m_nightmare_grp - .word se_w171_1 - .word se_w171_2 + .word se_m_nightmare_1 + .word se_m_nightmare_2 .end diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s new file mode 100644 index 0000000000..af30e24579 --- /dev/null +++ b/sound/songs/se_m_perish_song.s @@ -0,0 +1,221 @@ + .include "MPlayDef.s" + + .equ se_m_perish_song_grp, voicegroup128 + .equ se_m_perish_song_pri, 4 + .equ se_m_perish_song_rev, reverb_set+50 + .equ se_m_perish_song_mvl, 127 + .equ se_m_perish_song_key, 0 + .equ se_m_perish_song_tbs, 1 + .equ se_m_perish_song_exg, 0 + .equ se_m_perish_song_cmp, 1 + + .section .rodata + .global se_m_perish_song + .align 2 + +@********************** Track 1 **********************@ + +se_m_perish_song_1: + .byte KEYSH , se_m_perish_song_key+0 + .byte TEMPO , 100*se_m_perish_song_tbs/2 + .byte VOICE , 73 + .byte BENDR , 12 + .byte LFOS , 40 + .byte PAN , c_v+7 + .byte VOL , 25*se_m_perish_song_mvl/mxv + .byte BEND , c_v+0 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte N48 , An3 , v112 + .byte W03 + .byte VOL , 40*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+4 + .byte W02 +se_m_perish_song_1_000: + .byte VOL , 45*se_m_perish_song_mvl/mxv + .byte MOD , 8 + .byte W03 + .byte VOL , 51*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_001: + .byte VOL , 56*se_m_perish_song_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte VOL , 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_002: + .byte VOL , 72*se_m_perish_song_mvl/mxv + .byte PAN , c_v-4 + .byte W03 + .byte VOL , 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_003: + .byte VOL , 92*se_m_perish_song_mvl/mxv + .byte PAN , c_v-8 + .byte W03 + .byte VOL , 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND + .byte PAN , c_v-4 + .byte W06 + .byte VOL , 82*se_m_perish_song_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte VOL , 52*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte MOD , 0 + .byte PAN , c_v+4 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+7 + .byte W02 + .byte VOL , 33*se_m_perish_song_mvl/mxv + .byte N72 , Gs3 , v112 + .byte W03 + .byte VOL , 40*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+4 + .byte W02 + .byte PATT + .word se_m_perish_song_1_000 + .byte PATT + .word se_m_perish_song_1_001 + .byte PATT + .word se_m_perish_song_1_002 + .byte PATT + .word se_m_perish_song_1_003 + .byte PAN , c_v-4 + .byte W06 + .byte c_v+0 + .byte W06 + .byte c_v+4 + .byte W03 + .byte VOL , 87*se_m_perish_song_mvl/mxv + .byte W03 + .byte 75*se_m_perish_song_mvl/mxv + .byte PAN , c_v+7 + .byte W03 + .byte VOL , 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 48*se_m_perish_song_mvl/mxv + .byte PAN , c_v+4 + .byte W03 + .byte VOL , 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W02 + .byte VOL , 10*se_m_perish_song_mvl/mxv + .byte W03 + .byte W01 + .byte PAN , c_v-4 + .byte W05 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_perish_song_2: + .byte KEYSH , se_m_perish_song_key+0 + .byte VOICE , 73 + .byte VOL , 25*se_m_perish_song_mvl/mxv + .byte PAN , c_v-17 + .byte N48 , Cn4 , v100 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 40*se_m_perish_song_mvl/mxv + .byte W03 +se_m_perish_song_2_000: + .byte VOL , 45*se_m_perish_song_mvl/mxv + .byte MOD , 8 + .byte W03 + .byte VOL , 51*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND + .byte 56*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 72*se_m_perish_song_mvl/mxv + .byte W03 + .byte 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte 92*se_m_perish_song_mvl/mxv + .byte W03 + .byte 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte 82*se_m_perish_song_mvl/mxv + .byte W03 + .byte 52*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte MOD , 0 + .byte N72 , Bn3 , v100 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 40*se_m_perish_song_mvl/mxv + .byte W03 + .byte PATT + .word se_m_perish_song_2_000 + .byte VOL , 56*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 72*se_m_perish_song_mvl/mxv + .byte W03 + .byte 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte 92*se_m_perish_song_mvl/mxv + .byte W03 + .byte 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte W06 + .byte W03 + .byte 87*se_m_perish_song_mvl/mxv + .byte W03 + .byte 75*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 48*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte W03 + .byte 10*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_perish_song: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_perish_song_pri @ Priority + .byte se_m_perish_song_rev @ Reverb. + + .word se_m_perish_song_grp + + .word se_m_perish_song_1 + .word se_m_perish_song_2 + + .end diff --git a/sound/songs/se_w080.s b/sound/songs/se_m_petal_dance.s similarity index 80% rename from sound/songs/se_w080.s rename to sound/songs/se_m_petal_dance.s index 0027a0d650..c8ad2810d9 100644 --- a/sound/songs/se_w080.s +++ b/sound/songs/se_m_petal_dance.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w080_grp, voicegroup128 - .equ se_w080_pri, 4 - .equ se_w080_rev, reverb_set+50 - .equ se_w080_mvl, 127 - .equ se_w080_key, 0 - .equ se_w080_tbs, 1 - .equ se_w080_exg, 0 - .equ se_w080_cmp, 1 + .equ se_m_petal_dance_grp, voicegroup128 + .equ se_m_petal_dance_pri, 4 + .equ se_m_petal_dance_rev, reverb_set+50 + .equ se_m_petal_dance_mvl, 127 + .equ se_m_petal_dance_key, 0 + .equ se_m_petal_dance_tbs, 1 + .equ se_m_petal_dance_exg, 0 + .equ se_m_petal_dance_cmp, 1 .section .rodata - .global se_w080 + .global se_m_petal_dance .align 2 @********************** Track 1 **********************@ -se_w080_1: - .byte KEYSH , se_w080_key+0 - .byte TEMPO , 150*se_w080_tbs/2 +se_m_petal_dance_1: + .byte KEYSH , se_m_petal_dance_key+0 + .byte TEMPO , 150*se_m_petal_dance_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w080_mvl/mxv + .byte VOL , 95*se_m_petal_dance_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -112,11 +112,11 @@ se_w080_1: @********************** Track 2 **********************@ -se_w080_2: - .byte KEYSH , se_w080_key+0 +se_m_petal_dance_2: + .byte KEYSH , se_m_petal_dance_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w080_mvl/mxv + .byte VOL , 43*se_m_petal_dance_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , En6 , v108 @@ -191,15 +191,15 @@ se_w080_2: @******************************************************@ .align 2 -se_w080: +se_m_petal_dance: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w080_pri @ Priority - .byte se_w080_rev @ Reverb. + .byte se_m_petal_dance_pri @ Priority + .byte se_m_petal_dance_rev @ Reverb. - .word se_w080_grp + .word se_m_petal_dance_grp - .word se_w080_1 - .word se_w080_2 + .word se_m_petal_dance_1 + .word se_m_petal_dance_2 .end diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s new file mode 100644 index 0000000000..f48637385b --- /dev/null +++ b/sound/songs/se_m_poison_powder.s @@ -0,0 +1,58 @@ + .include "MPlayDef.s" + + .equ se_m_poison_powder_grp, voicegroup128 + .equ se_m_poison_powder_pri, 4 + .equ se_m_poison_powder_rev, reverb_set+50 + .equ se_m_poison_powder_mvl, 127 + .equ se_m_poison_powder_key, 0 + .equ se_m_poison_powder_tbs, 1 + .equ se_m_poison_powder_exg, 0 + .equ se_m_poison_powder_cmp, 1 + + .section .rodata + .global se_m_poison_powder + .align 2 + +@********************** Track 1 **********************@ + +se_m_poison_powder_1: + .byte KEYSH , se_m_poison_powder_key+0 + .byte TEMPO , 150*se_m_poison_powder_tbs/2 + .byte VOICE , 18 + .byte BENDR , 12 + .byte VOL , 55*se_m_poison_powder_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+1 + .byte N01 , Cn6 , v100 + .byte W01 + .byte VOL , 110*se_m_poison_powder_mvl/mxv + .byte W01 + .byte VOICE , 36 + .byte VOL , 55*se_m_poison_powder_mvl/mxv + .byte N02 , Gn6 , v080 + .byte W01 + .byte VOL , 110*se_m_poison_powder_mvl/mxv + .byte W04 + .byte PAN , c_v+20 + .byte N01 , Gn6 , v024 + .byte W03 + .byte Gn6 , v016 + .byte W02 + .byte PAN , c_v-21 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_poison_powder: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_poison_powder_pri @ Priority + .byte se_m_poison_powder_rev @ Reverb. + + .word se_m_poison_powder_grp + + .word se_m_poison_powder_1 + + .end diff --git a/sound/songs/se_w060.s b/sound/songs/se_m_psybeam.s similarity index 52% rename from sound/songs/se_w060.s rename to sound/songs/se_m_psybeam.s index 5207204297..c7f68cffd6 100644 --- a/sound/songs/se_w060.s +++ b/sound/songs/se_m_psybeam.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w060_grp, voicegroup128 - .equ se_w060_pri, 4 - .equ se_w060_rev, reverb_set+50 - .equ se_w060_mvl, 127 - .equ se_w060_key, 0 - .equ se_w060_tbs, 1 - .equ se_w060_exg, 0 - .equ se_w060_cmp, 1 + .equ se_m_psybeam_grp, voicegroup128 + .equ se_m_psybeam_pri, 4 + .equ se_m_psybeam_rev, reverb_set+50 + .equ se_m_psybeam_mvl, 127 + .equ se_m_psybeam_key, 0 + .equ se_m_psybeam_tbs, 1 + .equ se_m_psybeam_exg, 0 + .equ se_m_psybeam_cmp, 1 .section .rodata - .global se_w060 + .global se_m_psybeam .align 2 @********************** Track 1 **********************@ -se_w060_1: - .byte KEYSH , se_w060_key+0 - .byte TEMPO , 190*se_w060_tbs/2 +se_m_psybeam_1: + .byte KEYSH , se_m_psybeam_key+0 + .byte TEMPO , 190*se_m_psybeam_tbs/2 .byte VOICE , 45 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte N42 , As2 , v120 @@ -29,26 +29,26 @@ se_w060_1: .byte PAN , c_v+3 .byte W01 .byte c_v+5 - .byte VOL , 57*se_w060_mvl/mxv + .byte VOL , 57*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+9 .byte W01 - .byte VOL , 71*se_w060_mvl/mxv + .byte VOL , 71*se_m_psybeam_mvl/mxv .byte W02 .byte PAN , c_v+5 .byte W01 .byte c_v+1 - .byte VOL , 82*se_w060_mvl/mxv + .byte VOL , 82*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W01 .byte c_v-3 - .byte VOL , 94*se_w060_mvl/mxv + .byte VOL , 94*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte W02 .byte c_v-10 - .byte VOL , 110*se_w060_mvl/mxv + .byte VOL , 110*se_m_psybeam_mvl/mxv .byte W02 .byte PAN , c_v-6 .byte W01 @@ -66,79 +66,79 @@ se_w060_1: .byte c_v+5 .byte W02 .byte c_v+1 - .byte VOL , 95*se_w060_mvl/mxv + .byte VOL , 95*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W01 .byte c_v-3 - .byte VOL , 83*se_w060_mvl/mxv + .byte VOL , 83*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte W01 .byte c_v-10 - .byte VOL , 71*se_w060_mvl/mxv + .byte VOL , 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 .byte PAN , c_v-6 - .byte VOL , 56*se_w060_mvl/mxv + .byte VOL , 56*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-3 .byte W01 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte W03 .byte PAN , c_v+0 .byte FINE @********************** Track 2 **********************@ -se_w060_2: - .byte KEYSH , se_w060_key+0 +se_m_psybeam_2: + .byte KEYSH , se_m_psybeam_key+0 .byte VOICE , 47 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte N42 , As1 , v040 .byte W02 - .byte VOL , 57*se_w060_mvl/mxv + .byte VOL , 57*se_m_psybeam_mvl/mxv .byte W02 - .byte 71*se_w060_mvl/mxv + .byte 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 - .byte 82*se_w060_mvl/mxv + .byte 82*se_m_psybeam_mvl/mxv .byte W02 - .byte 94*se_w060_mvl/mxv + .byte 94*se_m_psybeam_mvl/mxv .byte W03 - .byte 110*se_w060_mvl/mxv + .byte 110*se_m_psybeam_mvl/mxv .byte W06 .byte W06 .byte W06 - .byte 95*se_w060_mvl/mxv + .byte 95*se_m_psybeam_mvl/mxv .byte W02 - .byte 83*se_w060_mvl/mxv + .byte 83*se_m_psybeam_mvl/mxv .byte W02 - .byte 71*se_w060_mvl/mxv + .byte 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 - .byte 56*se_w060_mvl/mxv + .byte 56*se_m_psybeam_mvl/mxv .byte W02 - .byte 38*se_w060_mvl/mxv + .byte 38*se_m_psybeam_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w060: +se_m_psybeam: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w060_pri @ Priority - .byte se_w060_rev @ Reverb. + .byte se_m_psybeam_pri @ Priority + .byte se_m_psybeam_rev @ Reverb. - .word se_w060_grp + .word se_m_psybeam_grp - .word se_w060_1 - .word se_w060_2 + .word se_m_psybeam_1 + .word se_m_psybeam_2 .end diff --git a/sound/songs/se_w060b.s b/sound/songs/se_m_psybeam2.s similarity index 59% rename from sound/songs/se_w060b.s rename to sound/songs/se_m_psybeam2.s index 45dc696342..e26a844c91 100644 --- a/sound/songs/se_w060b.s +++ b/sound/songs/se_m_psybeam2.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w060b_grp, voicegroup128 - .equ se_w060b_pri, 4 - .equ se_w060b_rev, reverb_set+50 - .equ se_w060b_mvl, 127 - .equ se_w060b_key, 0 - .equ se_w060b_tbs, 1 - .equ se_w060b_exg, 0 - .equ se_w060b_cmp, 1 + .equ se_m_psybeam2_grp, voicegroup128 + .equ se_m_psybeam2_pri, 4 + .equ se_m_psybeam2_rev, reverb_set+50 + .equ se_m_psybeam2_mvl, 127 + .equ se_m_psybeam2_key, 0 + .equ se_m_psybeam2_tbs, 1 + .equ se_m_psybeam2_exg, 0 + .equ se_m_psybeam2_cmp, 1 .section .rodata - .global se_w060b + .global se_m_psybeam2 .align 2 @********************** Track 1 **********************@ -se_w060b_1: - .byte KEYSH , se_w060b_key+0 - .byte TEMPO , 190*se_w060b_tbs/2 +se_m_psybeam2_1: + .byte KEYSH , se_m_psybeam2_key+0 + .byte TEMPO , 190*se_m_psybeam2_tbs/2 .byte VOICE , 45 .byte BENDR , 8 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-44 .byte N12 , Gs2 , v127 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+44 .byte W02 @@ -47,42 +47,42 @@ se_w060b_1: .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W02 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , Gs3 , v080 .byte W01 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-44 .byte N12 , As2 , v127 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W02 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+44 .byte W01 @@ -92,41 +92,41 @@ se_w060b_1: .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+28 .byte W02 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v-11 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , As3 , v056 .byte W01 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte BEND , c_v-44 .byte N12 , Gs2 , v080 .byte W02 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 @@ -136,42 +136,42 @@ se_w060b_1: .byte PAN , c_v-6 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , Gs3 , v024 .byte W02 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte BEND , c_v-44 .byte N12 , As2 , v040 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+27 .byte W02 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 @@ -181,19 +181,19 @@ se_w060b_1: .byte PAN , c_v-11 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+17 .byte W02 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , As3 , v016 .byte W01 .byte BEND , c_v+16 @@ -203,14 +203,14 @@ se_w060b_1: @******************************************************@ .align 2 -se_w060b: +se_m_psybeam2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w060b_pri @ Priority - .byte se_w060b_rev @ Reverb. + .byte se_m_psybeam2_pri @ Priority + .byte se_m_psybeam2_rev @ Reverb. - .word se_w060b_grp + .word se_m_psybeam2_grp - .word se_w060b_1 + .word se_m_psybeam2_1 .end diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s new file mode 100644 index 0000000000..810be06633 --- /dev/null +++ b/sound/songs/se_m_rain_dance.s @@ -0,0 +1,116 @@ + .include "MPlayDef.s" + + .equ se_m_rain_dance_grp, voicegroup128 + .equ se_m_rain_dance_pri, 4 + .equ se_m_rain_dance_rev, reverb_set+50 + .equ se_m_rain_dance_mvl, 127 + .equ se_m_rain_dance_key, 0 + .equ se_m_rain_dance_tbs, 1 + .equ se_m_rain_dance_exg, 0 + .equ se_m_rain_dance_cmp, 1 + + .section .rodata + .global se_m_rain_dance + .align 2 + +@********************** Track 1 **********************@ + +se_m_rain_dance_1: + .byte KEYSH , se_m_rain_dance_key+0 + .byte TEMPO , 220*se_m_rain_dance_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 20*se_m_rain_dance_mvl/mxv + .byte BEND , c_v+0 + .byte TIE , Gn3 , v064 + .byte W03 + .byte VOL , 37*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 53*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 60*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 71*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 81*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 93*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 110*se_m_rain_dance_mvl/mxv + .byte W03 + .byte PAN , c_v+3 + .byte W06 + .byte c_v+11 + .byte W12 + .byte c_v+20 + .byte W06 + .byte c_v+25 + .byte W12 + .byte c_v+14 + .byte W06 + .byte c_v+8 + .byte W06 + .byte W06 + .byte c_v-3 + .byte W12 + .byte c_v-16 + .byte W06 + .byte W06 + .byte c_v-26 + .byte W12 + .byte c_v-16 + .byte W06 + .byte VOL , 104*se_m_rain_dance_mvl/mxv + .byte PAN , c_v-5 + .byte W03 + .byte VOL , 101*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 98*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+6 + .byte W03 + .byte VOL , 93*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 90*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+14 + .byte W03 + .byte VOL , 86*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 83*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 77*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 73*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+24 + .byte W03 + .byte VOL , 66*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 58*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 44*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 32*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+15 + .byte W03 + .byte VOL , 16*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 1*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+4 + .byte W06 + .byte EOT + .byte FINE + +@******************************************************@ + .align 2 + +se_m_rain_dance: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_rain_dance_pri @ Priority + .byte se_m_rain_dance_rev @ Reverb. + + .word se_m_rain_dance_grp + + .word se_m_rain_dance_1 + + .end diff --git a/sound/songs/se_w115.s b/sound/songs/se_m_reflect.s similarity index 51% rename from sound/songs/se_w115.s rename to sound/songs/se_m_reflect.s index 4f9bfb71a7..56699c65ea 100644 --- a/sound/songs/se_w115.s +++ b/sound/songs/se_m_reflect.s @@ -1,99 +1,99 @@ .include "MPlayDef.s" - .equ se_w115_grp, voicegroup128 - .equ se_w115_pri, 4 - .equ se_w115_rev, reverb_set+50 - .equ se_w115_mvl, 127 - .equ se_w115_key, 0 - .equ se_w115_tbs, 1 - .equ se_w115_exg, 0 - .equ se_w115_cmp, 1 + .equ se_m_reflect_grp, voicegroup128 + .equ se_m_reflect_pri, 4 + .equ se_m_reflect_rev, reverb_set+50 + .equ se_m_reflect_mvl, 127 + .equ se_m_reflect_key, 0 + .equ se_m_reflect_tbs, 1 + .equ se_m_reflect_exg, 0 + .equ se_m_reflect_cmp, 1 .section .rodata - .global se_w115 + .global se_m_reflect .align 2 @********************** Track 1 **********************@ -se_w115_1: - .byte KEYSH , se_w115_key+0 - .byte TEMPO , 150*se_w115_tbs/2 +se_m_reflect_1: + .byte KEYSH , se_m_reflect_key+0 + .byte TEMPO , 150*se_m_reflect_tbs/2 .byte VOICE , 19 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v+6 .byte N06 , Gn6 , v080 .byte W01 .byte BEND , c_v-4 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-14 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-31 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-41 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn6 , v072 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-1 .byte N06 , Gn6 , v068 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-21 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-38 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-48 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-1 .byte N06 , Gn6 , v060 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-21 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-38 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-48 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v052 .byte W01 @@ -101,19 +101,19 @@ se_w115_1: .byte BEND , c_v-12 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v048 .byte W01 @@ -121,18 +121,18 @@ se_w115_1: .byte BEND , c_v-12 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v040 .byte W01 @@ -140,19 +140,19 @@ se_w115_1: .byte BEND , c_v-13 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v032 .byte W01 @@ -160,15 +160,15 @@ se_w115_1: .byte BEND , c_v-13 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte W06 @@ -176,92 +176,92 @@ se_w115_1: @********************** Track 2 **********************@ -se_w115_2: - .byte KEYSH , se_w115_key+0 +se_m_reflect_2: + .byte KEYSH , se_m_reflect_key+0 .byte VOICE , 53 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte W02 .byte N06 , En6 , v064 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v056 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 -se_w115_2_000: - .byte VOL , 60*se_w115_mvl/mxv +se_m_reflect_2_000: + .byte VOL , 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v052 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 .byte PEND .byte PATT - .word se_w115_2_000 - .byte VOL , 60*se_w115_mvl/mxv + .word se_m_reflect_2_000 + .byte VOL , 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v048 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v044 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v040 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v036 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W05 .byte FINE @******************************************************@ .align 2 -se_w115: +se_m_reflect: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w115_pri @ Priority - .byte se_w115_rev @ Reverb. + .byte se_m_reflect_pri @ Priority + .byte se_m_reflect_rev @ Reverb. - .word se_w115_grp + .word se_m_reflect_grp - .word se_w115_1 - .word se_w115_2 + .word se_m_reflect_1 + .word se_m_reflect_2 .end diff --git a/sound/songs/se_w179.s b/sound/songs/se_m_reversal.s similarity index 70% rename from sound/songs/se_w179.s rename to sound/songs/se_m_reversal.s index 9ea055b440..609c399f50 100644 --- a/sound/songs/se_w179.s +++ b/sound/songs/se_m_reversal.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ se_w179_grp, voicegroup128 - .equ se_w179_pri, 4 - .equ se_w179_rev, reverb_set+50 - .equ se_w179_mvl, 127 - .equ se_w179_key, 0 - .equ se_w179_tbs, 1 - .equ se_w179_exg, 0 - .equ se_w179_cmp, 1 + .equ se_m_reversal_grp, voicegroup128 + .equ se_m_reversal_pri, 4 + .equ se_m_reversal_rev, reverb_set+50 + .equ se_m_reversal_mvl, 127 + .equ se_m_reversal_key, 0 + .equ se_m_reversal_tbs, 1 + .equ se_m_reversal_exg, 0 + .equ se_m_reversal_cmp, 1 .section .rodata - .global se_w179 + .global se_m_reversal .align 2 @********************** Track 1 **********************@ -se_w179_1: - .byte KEYSH , se_w179_key+0 - .byte TEMPO , 150*se_w179_tbs/2 +se_m_reversal_1: + .byte KEYSH , se_m_reversal_key+0 + .byte TEMPO , 150*se_m_reversal_tbs/2 .byte VOICE , 19 .byte BENDR , 24 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte N03 , Cn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -36,14 +36,14 @@ se_w179_1: .byte N01 , Gn4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Cs5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -52,14 +52,14 @@ se_w179_1: .byte N01 , Gs4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Dn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W02 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -68,14 +68,14 @@ se_w179_1: .byte N01 , An4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Ds5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W02 .byte VOICE , 22 @@ -84,14 +84,14 @@ se_w179_1: .byte N01 , As4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , En5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -100,14 +100,14 @@ se_w179_1: .byte N01 , Bn4 , v127 .byte W02 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Fn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -116,14 +116,14 @@ se_w179_1: .byte N01 , Cn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Fs5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -132,14 +132,14 @@ se_w179_1: .byte N01 , Cs5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Gn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W02 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -148,14 +148,14 @@ se_w179_1: .byte N01 , Dn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Gs5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W02 .byte VOICE , 22 @@ -164,14 +164,14 @@ se_w179_1: .byte N01 , Ds5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , An5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -180,14 +180,14 @@ se_w179_1: .byte N01 , En5 , v127 .byte W02 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , As5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -196,14 +196,14 @@ se_w179_1: .byte N01 , Fn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Bn5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -218,10 +218,10 @@ se_w179_1: @********************** Track 2 **********************@ -se_w179_2: - .byte KEYSH , se_w179_key+0 +se_m_reversal_2: + .byte KEYSH , se_m_reversal_key+0 .byte VOICE , 17 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte W02 .byte BEND , c_v+31 .byte N03 , Cn5 , v040 @@ -322,15 +322,15 @@ se_w179_2: @******************************************************@ .align 2 -se_w179: +se_m_reversal: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w179_pri @ Priority - .byte se_w179_rev @ Reverb. + .byte se_m_reversal_pri @ Priority + .byte se_m_reversal_rev @ Reverb. - .word se_w179_grp + .word se_m_reversal_grp - .word se_w179_1 - .word se_w179_2 + .word se_m_reversal_1 + .word se_m_reversal_2 .end diff --git a/sound/songs/se_w088.s b/sound/songs/se_m_rock_throw.s similarity index 58% rename from sound/songs/se_w088.s rename to sound/songs/se_m_rock_throw.s index 9eceb812df..71dddd4475 100644 --- a/sound/songs/se_w088.s +++ b/sound/songs/se_m_rock_throw.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w088_grp, voicegroup128 - .equ se_w088_pri, 4 - .equ se_w088_rev, reverb_set+50 - .equ se_w088_mvl, 127 - .equ se_w088_key, 0 - .equ se_w088_tbs, 1 - .equ se_w088_exg, 0 - .equ se_w088_cmp, 1 + .equ se_m_rock_throw_grp, voicegroup128 + .equ se_m_rock_throw_pri, 4 + .equ se_m_rock_throw_rev, reverb_set+50 + .equ se_m_rock_throw_mvl, 127 + .equ se_m_rock_throw_key, 0 + .equ se_m_rock_throw_tbs, 1 + .equ se_m_rock_throw_exg, 0 + .equ se_m_rock_throw_cmp, 1 .section .rodata - .global se_w088 + .global se_m_rock_throw .align 2 @********************** Track 1 **********************@ -se_w088_1: - .byte KEYSH , se_w088_key+0 - .byte TEMPO , 150*se_w088_tbs/2 +se_m_rock_throw_1: + .byte KEYSH , se_m_rock_throw_key+0 + .byte TEMPO , 150*se_m_rock_throw_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 105*se_w088_mvl/mxv + .byte VOL , 105*se_m_rock_throw_mvl/mxv .byte BEND , c_v+0 .byte N06 , En3 , v127 .byte W03 @@ -52,14 +52,14 @@ se_w088_1: @******************************************************@ .align 2 -se_w088: +se_m_rock_throw: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w088_pri @ Priority - .byte se_w088_rev @ Reverb. + .byte se_m_rock_throw_pri @ Priority + .byte se_m_rock_throw_rev @ Reverb. - .word se_w088_grp + .word se_m_rock_throw_grp - .word se_w088_1 + .word se_m_rock_throw_1 .end diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s new file mode 100644 index 0000000000..5e6c864e20 --- /dev/null +++ b/sound/songs/se_m_sacred_fire.s @@ -0,0 +1,105 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire_grp, voicegroup128 + .equ se_m_sacred_fire_pri, 4 + .equ se_m_sacred_fire_rev, reverb_set+50 + .equ se_m_sacred_fire_mvl, 127 + .equ se_m_sacred_fire_key, 0 + .equ se_m_sacred_fire_tbs, 1 + .equ se_m_sacred_fire_exg, 0 + .equ se_m_sacred_fire_cmp, 1 + + .section .rodata + .global se_m_sacred_fire + .align 2 + +@********************** Track 1 **********************@ + +se_m_sacred_fire_1: + .byte KEYSH , se_m_sacred_fire_key+0 + .byte TEMPO , 150*se_m_sacred_fire_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte VOL , 110*se_m_sacred_fire_mvl/mxv + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte N04 , Cn3 , v127 + .byte W03 + .byte PAN , c_v+0 + .byte W01 + .byte N18 , Gn4 + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 98*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+2 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 83*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+6 + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte BEND , c_v+9 + .byte W01 + .byte VOL , 63*se_m_sacred_fire_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte BEND , c_v+13 + .byte W02 + .byte VOL , 44*se_m_sacred_fire_mvl/mxv + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 28*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+20 + .byte W01 + .byte PAN , c_v-2 + .byte W01 + .byte VOL , 12*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sacred_fire_2: + .byte KEYSH , se_m_sacred_fire_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_sacred_fire_mvl/mxv + .byte N01 , Gn2 , v032 + .byte W02 + .byte N01 + .byte W02 + .byte N18 + .byte W03 + .byte VOL , 98*se_m_sacred_fire_mvl/mxv + .byte W03 + .byte 83*se_m_sacred_fire_mvl/mxv + .byte W04 + .byte 63*se_m_sacred_fire_mvl/mxv + .byte W04 + .byte 44*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte 28*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte 12*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sacred_fire: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sacred_fire_pri @ Priority + .byte se_m_sacred_fire_rev @ Reverb. + + .word se_m_sacred_fire_grp + + .word se_m_sacred_fire_1 + .word se_m_sacred_fire_2 + + .end diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s new file mode 100644 index 0000000000..f255e712a9 --- /dev/null +++ b/sound/songs/se_m_sacred_fire2.s @@ -0,0 +1,180 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire2_grp, voicegroup128 + .equ se_m_sacred_fire2_pri, 4 + .equ se_m_sacred_fire2_rev, reverb_set+50 + .equ se_m_sacred_fire2_mvl, 127 + .equ se_m_sacred_fire2_key, 0 + .equ se_m_sacred_fire2_tbs, 1 + .equ se_m_sacred_fire2_exg, 0 + .equ se_m_sacred_fire2_cmp, 1 + + .section .rodata + .global se_m_sacred_fire2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_sacred_fire2_1: + .byte KEYSH , se_m_sacred_fire2_key+0 + .byte TEMPO , 150*se_m_sacred_fire2_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte VOL , 22*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte N96 , Gn3 , v127 + .byte W01 + .byte VOL , 49*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_sacred_fire2_mvl/mxv + .byte BEND , c_v+8 + .byte W01 + .byte VOL , 110*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte BEND , c_v+16 + .byte W03 + .byte VOL , 97*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+7 + .byte W03 + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 84*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte BEND , c_v-9 + .byte W03 + .byte VOL , 76*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v-5 + .byte BEND , c_v-24 + .byte W03 + .byte PAN , c_v-2 + .byte BEND , c_v-46 + .byte W03 + .byte VOL , 84*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+5 + .byte W03 + .byte c_v+0 + .byte W01 + .byte VOL , 92*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte BEND , c_v-32 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W02 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 78*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte W02 + .byte VOL , 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v-2 + .byte W03 + .byte c_v+5 + .byte W03 + .byte c_v+0 + .byte VOL , 78*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v+5 + .byte W02 + .byte VOL , 90*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte W03 + .byte c_v-2 + .byte W01 + .byte VOL , 80*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W03 + .byte c_v+0 + .byte W01 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W03 + .byte c_v+0 + .byte VOL , 83*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 63*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 37*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte VOL , 13*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v-2 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sacred_fire2_2: + .byte KEYSH , se_m_sacred_fire2_key+0 + .byte VOICE , 27 + .byte VOL , 22*se_m_sacred_fire2_mvl/mxv + .byte N96 , Gn2 , v032 + .byte W01 + .byte VOL , 49*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 95*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 110*se_m_sacred_fire2_mvl/mxv + .byte W05 + .byte 97*se_m_sacred_fire2_mvl/mxv + .byte W15 + .byte W24 + .byte W24 + .byte W09 + .byte 83*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 63*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 37*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 13*se_m_sacred_fire2_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sacred_fire2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sacred_fire2_pri @ Priority + .byte se_m_sacred_fire2_rev @ Reverb. + + .word se_m_sacred_fire2_grp + + .word se_m_sacred_fire2_1 + .word se_m_sacred_fire2_2 + + .end diff --git a/sound/songs/se_w328.s b/sound/songs/se_m_sand_tomb.s similarity index 69% rename from sound/songs/se_w328.s rename to sound/songs/se_m_sand_tomb.s index 6b5a2d923f..8edf0abf88 100644 --- a/sound/songs/se_w328.s +++ b/sound/songs/se_m_sand_tomb.s @@ -1,45 +1,45 @@ .include "MPlayDef.s" - .equ se_w328_grp, voicegroup128 - .equ se_w328_pri, 4 - .equ se_w328_rev, reverb_set+50 - .equ se_w328_mvl, 127 - .equ se_w328_key, 0 - .equ se_w328_tbs, 1 - .equ se_w328_exg, 0 - .equ se_w328_cmp, 1 + .equ se_m_sand_tomb_grp, voicegroup128 + .equ se_m_sand_tomb_pri, 4 + .equ se_m_sand_tomb_rev, reverb_set+50 + .equ se_m_sand_tomb_mvl, 127 + .equ se_m_sand_tomb_key, 0 + .equ se_m_sand_tomb_tbs, 1 + .equ se_m_sand_tomb_exg, 0 + .equ se_m_sand_tomb_cmp, 1 .section .rodata - .global se_w328 + .global se_m_sand_tomb .align 2 @********************** Track 1 **********************@ -se_w328_1: - .byte KEYSH , se_w328_key+0 - .byte TEMPO , 150*se_w328_tbs/2 +se_m_sand_tomb_1: + .byte KEYSH , se_m_sand_tomb_key+0 + .byte TEMPO , 150*se_m_sand_tomb_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 64*se_w328_mvl/mxv + .byte VOL , 64*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte N96 , En2 , v127 .byte W03 - .byte VOL , 79*se_w328_mvl/mxv + .byte VOL , 79*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 84*se_w328_mvl/mxv + .byte VOL , 84*se_m_sand_tomb_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 91*se_w328_mvl/mxv + .byte VOL , 91*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 100*se_w328_mvl/mxv + .byte VOL , 100*se_m_sand_tomb_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 110*se_w328_mvl/mxv + .byte VOL , 110*se_m_sand_tomb_mvl/mxv .byte W03 .byte PAN , c_v-12 .byte W06 @@ -82,46 +82,46 @@ se_w328_1: .byte PAN , c_v-11 .byte W03 .byte c_v-17 - .byte VOL , 98*se_w328_mvl/mxv + .byte VOL , 98*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 90*se_w328_mvl/mxv + .byte VOL , 90*se_m_sand_tomb_mvl/mxv .byte BEND , c_v-7 .byte W03 .byte PAN , c_v-9 .byte BEND , c_v-12 .byte W01 - .byte VOL , 80*se_w328_mvl/mxv + .byte VOL , 80*se_m_sand_tomb_mvl/mxv .byte W02 .byte BEND , c_v-20 .byte W01 - .byte VOL , 71*se_w328_mvl/mxv + .byte VOL , 71*se_m_sand_tomb_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte W02 - .byte VOL , 58*se_w328_mvl/mxv + .byte VOL , 58*se_m_sand_tomb_mvl/mxv .byte W01 .byte PAN , c_v+6 .byte BEND , c_v-13 .byte W03 .byte PAN , c_v+10 - .byte VOL , 45*se_w328_mvl/mxv + .byte VOL , 45*se_m_sand_tomb_mvl/mxv .byte W02 - .byte 27*se_w328_mvl/mxv + .byte 27*se_m_sand_tomb_mvl/mxv .byte W01 .byte BEND , c_v-6 .byte W01 - .byte VOL , 11*se_w328_mvl/mxv + .byte VOL , 11*se_m_sand_tomb_mvl/mxv .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w328_2: - .byte KEYSH , se_w328_key+0 +se_m_sand_tomb_2: + .byte KEYSH , se_m_sand_tomb_key+0 .byte VOICE , 57 .byte PAN , c_v+0 - .byte VOL , 110*se_w328_mvl/mxv + .byte VOL , 110*se_m_sand_tomb_mvl/mxv .byte N03 , Cn3 , v100 .byte W03 .byte En3 , v080 @@ -183,15 +183,15 @@ se_w328_2: @******************************************************@ .align 2 -se_w328: +se_m_sand_tomb: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w328_pri @ Priority - .byte se_w328_rev @ Reverb. + .byte se_m_sand_tomb_pri @ Priority + .byte se_m_sand_tomb_rev @ Reverb. - .word se_w328_grp + .word se_m_sand_tomb_grp - .word se_w328_1 - .word se_w328_2 + .word se_m_sand_tomb_1 + .word se_m_sand_tomb_2 .end diff --git a/sound/songs/se_w201.s b/sound/songs/se_m_sandstorm.s similarity index 73% rename from sound/songs/se_w201.s rename to sound/songs/se_m_sandstorm.s index b6a6aaff53..9674cd043f 100644 --- a/sound/songs/se_w201.s +++ b/sound/songs/se_m_sandstorm.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w201_grp, voicegroup128 - .equ se_w201_pri, 4 - .equ se_w201_rev, reverb_set+50 - .equ se_w201_mvl, 127 - .equ se_w201_key, 0 - .equ se_w201_tbs, 1 - .equ se_w201_exg, 0 - .equ se_w201_cmp, 1 + .equ se_m_sandstorm_grp, voicegroup128 + .equ se_m_sandstorm_pri, 4 + .equ se_m_sandstorm_rev, reverb_set+50 + .equ se_m_sandstorm_mvl, 127 + .equ se_m_sandstorm_key, 0 + .equ se_m_sandstorm_tbs, 1 + .equ se_m_sandstorm_exg, 0 + .equ se_m_sandstorm_cmp, 1 .section .rodata - .global se_w201 + .global se_m_sandstorm .align 2 @********************** Track 1 **********************@ -se_w201_1: - .byte KEYSH , se_w201_key+0 - .byte TEMPO , 200*se_w201_tbs/2 +se_m_sandstorm_1: + .byte KEYSH , se_m_sandstorm_key+0 + .byte TEMPO , 200*se_m_sandstorm_tbs/2 .byte VOICE , 2 .byte BENDR , 12 .byte PAN , c_v-48 - .byte VOL , 11*se_w201_mvl/mxv + .byte VOL , 11*se_m_sandstorm_mvl/mxv .byte BEND , c_v+0 .byte TIE , En3 , v127 .byte W03 - .byte VOL , 17*se_w201_mvl/mxv + .byte VOL , 17*se_m_sandstorm_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 24*se_w201_mvl/mxv + .byte VOL , 24*se_m_sandstorm_mvl/mxv .byte W03 - .byte 32*se_w201_mvl/mxv + .byte 32*se_m_sandstorm_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 52*se_w201_mvl/mxv + .byte VOL , 52*se_m_sandstorm_mvl/mxv .byte W03 - .byte 65*se_w201_mvl/mxv + .byte 65*se_m_sandstorm_mvl/mxv .byte W03 - .byte 76*se_w201_mvl/mxv + .byte 76*se_m_sandstorm_mvl/mxv .byte W02 - .byte 88*se_w201_mvl/mxv + .byte 88*se_m_sandstorm_mvl/mxv .byte PAN , c_v-43 .byte W02 - .byte VOL , 98*se_w201_mvl/mxv + .byte VOL , 98*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W02 - .byte VOL , 111*se_w201_mvl/mxv + .byte VOL , 111*se_m_sandstorm_mvl/mxv .byte W01 .byte BEND , c_v-7 .byte W01 - .byte VOL , 127*se_w201_mvl/mxv + .byte VOL , 127*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v-12 .byte W02 @@ -134,31 +134,31 @@ se_w201_1: .byte W03 .byte c_v+7 .byte W04 - .byte VOL , 114*se_w201_mvl/mxv + .byte VOL , 114*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W01 .byte PAN , c_v+48 .byte W01 - .byte VOL , 104*se_w201_mvl/mxv + .byte VOL , 104*se_m_sandstorm_mvl/mxv .byte W01 .byte BEND , c_v-7 .byte W03 - .byte VOL , 93*se_w201_mvl/mxv + .byte VOL , 93*se_m_sandstorm_mvl/mxv .byte BEND , c_v-12 .byte W03 - .byte VOL , 82*se_w201_mvl/mxv + .byte VOL , 82*se_m_sandstorm_mvl/mxv .byte BEND , c_v-20 .byte W04 - .byte VOL , 67*se_w201_mvl/mxv + .byte VOL , 67*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v-13 .byte W01 - .byte VOL , 52*se_w201_mvl/mxv + .byte VOL , 52*se_m_sandstorm_mvl/mxv .byte W03 - .byte 32*se_w201_mvl/mxv + .byte 32*se_m_sandstorm_mvl/mxv .byte W02 - .byte 13*se_w201_mvl/mxv + .byte 13*se_m_sandstorm_mvl/mxv .byte BEND , c_v-6 .byte W03 .byte EOT @@ -166,11 +166,11 @@ se_w201_1: @********************** Track 2 **********************@ -se_w201_2: - .byte KEYSH , se_w201_key+0 +se_m_sandstorm_2: + .byte KEYSH , se_m_sandstorm_key+0 .byte VOICE , 57 .byte PAN , c_v+0 - .byte VOL , 60*se_w201_mvl/mxv + .byte VOL , 60*se_m_sandstorm_mvl/mxv .byte N03 , Cn3 , v100 .byte W03 .byte En3 , v080 @@ -185,7 +185,7 @@ se_w201_2: .byte W03 .byte Cn3 , v100 .byte W03 -se_w201_2_000: +se_m_sandstorm_2_000: .byte W01 .byte N03 , En3 , v080 .byte W03 @@ -230,7 +230,7 @@ se_w201_2_000: .byte Cn3 , v100 .byte W03 .byte PATT - .word se_w201_2_000 + .word se_m_sandstorm_2_000 .byte W02 .byte N03 , Cn3 , v076 .byte W04 @@ -276,15 +276,15 @@ se_w201_2_000: @******************************************************@ .align 2 -se_w201: +se_m_sandstorm: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w201_pri @ Priority - .byte se_w201_rev @ Reverb. + .byte se_m_sandstorm_pri @ Priority + .byte se_m_sandstorm_rev @ Reverb. - .word se_w201_grp + .word se_m_sandstorm_grp - .word se_w201_1 - .word se_w201_2 + .word se_m_sandstorm_1 + .word se_m_sandstorm_2 .end diff --git a/sound/songs/se_w103.s b/sound/songs/se_m_screech.s similarity index 56% rename from sound/songs/se_w103.s rename to sound/songs/se_m_screech.s index d35ec99ad5..378cf71281 100644 --- a/sound/songs/se_w103.s +++ b/sound/songs/se_m_screech.s @@ -1,24 +1,24 @@ .include "MPlayDef.s" - .equ se_w103_grp, voicegroup128 - .equ se_w103_pri, 4 - .equ se_w103_rev, reverb_set+50 - .equ se_w103_mvl, 127 - .equ se_w103_key, 0 - .equ se_w103_tbs, 1 - .equ se_w103_exg, 0 - .equ se_w103_cmp, 1 + .equ se_m_screech_grp, voicegroup128 + .equ se_m_screech_pri, 4 + .equ se_m_screech_rev, reverb_set+50 + .equ se_m_screech_mvl, 127 + .equ se_m_screech_key, 0 + .equ se_m_screech_tbs, 1 + .equ se_m_screech_exg, 0 + .equ se_m_screech_cmp, 1 .section .rodata - .global se_w103 + .global se_m_screech .align 2 @********************** Track 1 **********************@ -se_w103_1: - .byte VOL , 110*se_w103_mvl/mxv - .byte KEYSH , se_w103_key+0 - .byte TEMPO , 150*se_w103_tbs/2 +se_m_screech_1: + .byte VOL , 110*se_m_screech_mvl/mxv + .byte KEYSH , se_m_screech_key+0 + .byte TEMPO , 150*se_m_screech_tbs/2 .byte VOICE , 44 .byte BENDR , 2 .byte PAN , c_v+0 @@ -28,27 +28,27 @@ se_w103_1: .byte PAN , c_v-5 .byte W01 .byte c_v-10 - .byte VOL , 15*se_w103_mvl/mxv + .byte VOL , 15*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v-4 - .byte VOL , 41*se_w103_mvl/mxv + .byte VOL , 41*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v+0 - .byte VOL , 69*se_w103_mvl/mxv + .byte VOL , 69*se_m_screech_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W01 .byte c_v+10 - .byte VOL , 84*se_w103_mvl/mxv + .byte VOL , 84*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v+4 .byte W01 - .byte VOL , 97*se_w103_mvl/mxv + .byte VOL , 97*se_m_screech_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v-5 .byte W02 - .byte VOL , 110*se_w103_mvl/mxv + .byte VOL , 110*se_m_screech_mvl/mxv .byte PAN , c_v-10 .byte W01 .byte c_v-4 @@ -59,13 +59,13 @@ se_w103_1: .byte W01 .byte c_v+10 .byte W02 - .byte VOL , 100*se_w103_mvl/mxv + .byte VOL , 100*se_m_screech_mvl/mxv .byte PAN , c_v+4 .byte W01 - .byte VOL , 84*se_w103_mvl/mxv + .byte VOL , 84*se_m_screech_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 55*se_w103_mvl/mxv + .byte VOL , 55*se_m_screech_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W02 @@ -73,9 +73,9 @@ se_w103_1: @********************** Track 2 **********************@ -se_w103_2: - .byte VOL , 110*se_w103_mvl/mxv - .byte KEYSH , se_w103_key+0 +se_m_screech_2: + .byte VOL , 110*se_m_screech_mvl/mxv + .byte KEYSH , se_m_screech_key+0 .byte VOICE , 42 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -98,15 +98,15 @@ se_w103_2: @******************************************************@ .align 2 -se_w103: +se_m_screech: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w103_pri @ Priority - .byte se_w103_rev @ Reverb. + .byte se_m_screech_pri @ Priority + .byte se_m_screech_rev @ Reverb. - .word se_w103_grp + .word se_m_screech_grp - .word se_w103_1 - .word se_w103_2 + .word se_m_screech_1 + .word se_m_screech_2 .end diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s new file mode 100644 index 0000000000..f2ab617ca8 --- /dev/null +++ b/sound/songs/se_m_self_destruct.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_m_self_destruct_grp, voicegroup128 + .equ se_m_self_destruct_pri, 4 + .equ se_m_self_destruct_rev, reverb_set+50 + .equ se_m_self_destruct_mvl, 127 + .equ se_m_self_destruct_key, 0 + .equ se_m_self_destruct_tbs, 1 + .equ se_m_self_destruct_exg, 0 + .equ se_m_self_destruct_cmp, 1 + + .section .rodata + .global se_m_self_destruct + .align 2 + +@********************** Track 1 **********************@ + +se_m_self_destruct_1: + .byte KEYSH , se_m_self_destruct_key+0 + .byte TEMPO , 150*se_m_self_destruct_tbs/2 + .byte VOICE , 41 + .byte VOL , 115*se_m_self_destruct_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N01 , Gn3 , v127 + .byte W01 + .byte Cn3 + .byte W01 + .byte N24 , An3 + .byte W06 + .byte PAN , c_v+6 + .byte W04 + .byte c_v+0 + .byte W01 + .byte VOL , 102*se_m_self_destruct_mvl/mxv + .byte W02 + .byte PAN , c_v-8 + .byte VOL , 88*se_m_self_destruct_mvl/mxv + .byte W03 + .byte 78*se_m_self_destruct_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 67*se_m_self_destruct_mvl/mxv + .byte W01 + .byte BEND , c_v-2 + .byte W01 + .byte PAN , c_v+7 + .byte VOL , 45*se_m_self_destruct_mvl/mxv + .byte W02 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 13*se_m_self_destruct_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v-15 + .byte W22 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_self_destruct: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_self_destruct_pri @ Priority + .byte se_m_self_destruct_rev @ Reverb. + + .word se_m_self_destruct_grp + + .word se_m_self_destruct_1 + + .end diff --git a/sound/songs/se_w047.s b/sound/songs/se_m_sing.s similarity index 51% rename from sound/songs/se_w047.s rename to sound/songs/se_m_sing.s index 688b782ed4..f12509f56e 100644 --- a/sound/songs/se_w047.s +++ b/sound/songs/se_m_sing.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_w047_grp, voicegroup128 - .equ se_w047_pri, 4 - .equ se_w047_rev, reverb_set+50 - .equ se_w047_mvl, 127 - .equ se_w047_key, 0 - .equ se_w047_tbs, 1 - .equ se_w047_exg, 0 - .equ se_w047_cmp, 1 + .equ se_m_sing_grp, voicegroup128 + .equ se_m_sing_pri, 4 + .equ se_m_sing_rev, reverb_set+50 + .equ se_m_sing_mvl, 127 + .equ se_m_sing_key, 0 + .equ se_m_sing_tbs, 1 + .equ se_m_sing_exg, 0 + .equ se_m_sing_cmp, 1 .section .rodata - .global se_w047 + .global se_m_sing .align 2 @********************** Track 1 **********************@ -se_w047_1: - .byte KEYSH , se_w047_key+0 - .byte TEMPO , 100*se_w047_tbs/2 +se_m_sing_1: + .byte KEYSH , se_m_sing_key+0 + .byte TEMPO , 100*se_m_sing_tbs/2 .byte VOICE , 73 .byte BENDR , 12 .byte LFOS , 40 .byte PAN , c_v+0 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte BEND , c_v+0 .byte N44 , Gn4 , v112 .byte W06 @@ -31,47 +31,47 @@ se_w047_1: .byte MOD , 7 .byte W03 .byte W03 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W03 .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte N21 , Fn5 .byte W06 .byte W06 -se_w047_1_000: - .byte VOL , 86*se_w047_mvl/mxv +se_m_sing_1_000: + .byte VOL , 86*se_m_sing_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 75*se_w047_mvl/mxv + .byte VOL , 75*se_m_sing_mvl/mxv .byte W03 .byte PEND -se_w047_1_001: - .byte VOL , 55*se_w047_mvl/mxv +se_m_sing_1_001: + .byte VOL , 55*se_m_sing_mvl/mxv .byte W03 - .byte 26*se_w047_mvl/mxv + .byte 26*se_m_sing_mvl/mxv .byte MOD , 0 .byte W03 .byte PEND - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte N21 , Ds5 , v112 .byte W06 .byte W06 .byte PATT - .word se_w047_1_000 + .word se_m_sing_1_000 .byte PATT - .word se_w047_1_001 - .byte VOL , 95*se_w047_mvl/mxv + .word se_m_sing_1_001 + .byte VOL , 95*se_m_sing_mvl/mxv .byte N66 , Gn4 , v112 .byte W06 .byte W06 @@ -81,13 +81,13 @@ se_w047_1_001: .byte W06 .byte W06 .byte W06 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W06 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W06 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W06 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 @@ -96,11 +96,11 @@ se_w047_1_001: @********************** Track 2 **********************@ -se_w047_2: - .byte KEYSH , se_w047_key+0 +se_m_sing_2: + .byte KEYSH , se_m_sing_key+0 .byte VOICE , 73 .byte LFOS , 40 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte BEND , c_v+9 .byte W06 .byte W06 @@ -112,49 +112,49 @@ se_w047_2: .byte MOD , 7 .byte W03 .byte W03 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W03 .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v-12 .byte N21 , Fn5 .byte W06 .byte W06 -se_w047_2_000: - .byte VOL , 86*se_w047_mvl/mxv +se_m_sing_2_000: + .byte VOL , 86*se_m_sing_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 75*se_w047_mvl/mxv + .byte VOL , 75*se_m_sing_mvl/mxv .byte W03 .byte PEND -se_w047_2_001: - .byte VOL , 55*se_w047_mvl/mxv +se_m_sing_2_001: + .byte VOL , 55*se_m_sing_mvl/mxv .byte W03 - .byte 26*se_w047_mvl/mxv + .byte 26*se_m_sing_mvl/mxv .byte MOD , 0 .byte W03 .byte PEND - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v+12 .byte N21 , Ds5 , v060 .byte W06 .byte W06 .byte PATT - .word se_w047_2_000 + .word se_m_sing_2_000 .byte PATT - .word se_w047_2_001 - .byte VOL , 95*se_w047_mvl/mxv + .word se_m_sing_2_001 + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v-12 .byte N66 , Gn4 , v060 .byte W06 @@ -168,14 +168,14 @@ se_w047_2_001: .byte W06 .byte c_v+7 .byte W06 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W06 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte PAN , c_v+15 .byte W06 - .byte VOL , 50*se_w047_mvl/mxv + .byte VOL , 50*se_m_sing_mvl/mxv .byte W06 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte PAN , c_v+8 .byte W06 .byte MOD , 0 @@ -184,15 +184,15 @@ se_w047_2_001: @******************************************************@ .align 2 -se_w047: +se_m_sing: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w047_pri @ Priority - .byte se_w047_rev @ Reverb. + .byte se_m_sing_pri @ Priority + .byte se_m_sing_rev @ Reverb. - .word se_w047_grp + .word se_m_sing_grp - .word se_w047_1 - .word se_w047_2 + .word se_m_sing_1 + .word se_m_sing_2 .end diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s new file mode 100644 index 0000000000..3657d20092 --- /dev/null +++ b/sound/songs/se_m_sketch.s @@ -0,0 +1,68 @@ + .include "MPlayDef.s" + + .equ se_m_sketch_grp, voicegroup128 + .equ se_m_sketch_pri, 4 + .equ se_m_sketch_rev, reverb_set+50 + .equ se_m_sketch_mvl, 127 + .equ se_m_sketch_key, 0 + .equ se_m_sketch_tbs, 1 + .equ se_m_sketch_exg, 0 + .equ se_m_sketch_cmp, 1 + + .section .rodata + .global se_m_sketch + .align 2 + +@********************** Track 1 **********************@ + +se_m_sketch_1: + .byte KEYSH , se_m_sketch_key+0 + .byte TEMPO , 180*se_m_sketch_tbs/2 + .byte VOICE , 38 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_sketch_mvl/mxv + .byte BEND , c_v+0 + .byte N02 , Gn4 , v127 + .byte W01 + .byte VOL , 74*se_m_sketch_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte VOICE , 31 + .byte VOL , 40*se_m_sketch_mvl/mxv + .byte BEND , c_v-1 + .byte N03 , Cs5 + .byte W01 + .byte VOL , 64*se_m_sketch_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-12 + .byte W01 + .byte VOL , 86*se_m_sketch_mvl/mxv + .byte PAN , c_v+4 + .byte BEND , c_v-16 + .byte W02 + .byte VOL , 110*se_m_sketch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N02 , As5 + .byte W01 + .byte BEND , c_v+12 + .byte W01 + .byte VOL , 0*se_m_sketch_mvl/mxv + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sketch: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sketch_pri @ Priority + .byte se_m_sketch_rev @ Reverb. + + .word se_m_sketch_grp + + .word se_m_sketch_1 + + .end diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s new file mode 100644 index 0000000000..66a791f96c --- /dev/null +++ b/sound/songs/se_m_sky_uppercut.s @@ -0,0 +1,103 @@ + .include "MPlayDef.s" + + .equ se_m_sky_uppercut_grp, voicegroup128 + .equ se_m_sky_uppercut_pri, 4 + .equ se_m_sky_uppercut_rev, reverb_set+50 + .equ se_m_sky_uppercut_mvl, 127 + .equ se_m_sky_uppercut_key, 0 + .equ se_m_sky_uppercut_tbs, 1 + .equ se_m_sky_uppercut_exg, 0 + .equ se_m_sky_uppercut_cmp, 1 + + .section .rodata + .global se_m_sky_uppercut + .align 2 + +@********************** Track 1 **********************@ + +se_m_sky_uppercut_1: + .byte KEYSH , se_m_sky_uppercut_key+0 + .byte TEMPO , 220*se_m_sky_uppercut_tbs/2 + .byte VOICE , 41 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+6 + .byte BEND , c_v+0 + .byte N02 , Cn4 , v127 + .byte W03 + .byte VOL , 104*se_m_sky_uppercut_mvl/mxv + .byte W03 + .byte 93*se_m_sky_uppercut_mvl/mxv + .byte PAN , c_v-6 + .byte N02 , Cn5 + .byte W03 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte W01 + .byte VOICE , 22 + .byte PAN , c_v+0 + .byte N24 , Cn4 , v060 + .byte W02 + .byte W02 + .byte BEND , c_v+0 + .byte W04 + .byte c_v+1 + .byte W03 + .byte c_v+1 + .byte W01 + .byte VOL , 105*se_m_sky_uppercut_mvl/mxv + .byte W02 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 103*se_m_sky_uppercut_mvl/mxv + .byte W02 + .byte 91*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v+0 + .byte W03 + .byte VOL , 77*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-1 + .byte W02 + .byte VOL , 61*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-2 + .byte W01 + .byte VOL , 38*se_m_sky_uppercut_mvl/mxv + .byte W01 + .byte 15*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-3 + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sky_uppercut_2: + .byte KEYSH , se_m_sky_uppercut_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte N02 , Cn3 , v060 + .byte W03 + .byte Gn2 + .byte W03 + .byte Gs4 + .byte W04 + .byte Gs4 , v020 + .byte W02 + .byte W06 + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sky_uppercut: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sky_uppercut_pri @ Priority + .byte se_m_sky_uppercut_rev @ Reverb. + + .word se_m_sky_uppercut_grp + + .word se_m_sky_uppercut_1 + .word se_m_sky_uppercut_2 + + .end diff --git a/sound/songs/se_w173.s b/sound/songs/se_m_snore.s similarity index 50% rename from sound/songs/se_w173.s rename to sound/songs/se_m_snore.s index a0bbd6378f..aff9ef5e37 100644 --- a/sound/songs/se_w173.s +++ b/sound/songs/se_m_snore.s @@ -1,65 +1,65 @@ .include "MPlayDef.s" - .equ se_w173_grp, voicegroup128 - .equ se_w173_pri, 4 - .equ se_w173_rev, reverb_set+50 - .equ se_w173_mvl, 127 - .equ se_w173_key, 0 - .equ se_w173_tbs, 1 - .equ se_w173_exg, 0 - .equ se_w173_cmp, 1 + .equ se_m_snore_grp, voicegroup128 + .equ se_m_snore_pri, 4 + .equ se_m_snore_rev, reverb_set+50 + .equ se_m_snore_mvl, 127 + .equ se_m_snore_key, 0 + .equ se_m_snore_tbs, 1 + .equ se_m_snore_exg, 0 + .equ se_m_snore_cmp, 1 .section .rodata - .global se_w173 + .global se_m_snore .align 2 @********************** Track 1 **********************@ -se_w173_1: - .byte KEYSH , se_w173_key+0 - .byte TEMPO , 220*se_w173_tbs/2 +se_m_snore_1: + .byte KEYSH , se_m_snore_key+0 + .byte TEMPO , 220*se_m_snore_tbs/2 .byte VOICE , 38 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 27*se_w173_mvl/mxv + .byte VOL , 27*se_m_snore_mvl/mxv .byte BEND , c_v+0 .byte N10 , An1 , v127 .byte W01 - .byte VOL , 75*se_w173_mvl/mxv + .byte VOL , 75*se_m_snore_mvl/mxv .byte W01 - .byte 120*se_w173_mvl/mxv + .byte 120*se_m_snore_mvl/mxv .byte W04 .byte W02 - .byte 75*se_w173_mvl/mxv + .byte 75*se_m_snore_mvl/mxv .byte W01 - .byte 28*se_w173_mvl/mxv + .byte 28*se_m_snore_mvl/mxv .byte W03 .byte VOICE , 36 - .byte VOL , 83*se_w173_mvl/mxv + .byte VOL , 83*se_m_snore_mvl/mxv .byte N18 , En2 , v112 .byte W02 - .byte VOL , 87*se_w173_mvl/mxv + .byte VOL , 87*se_m_snore_mvl/mxv .byte W02 - .byte 91*se_w173_mvl/mxv + .byte 91*se_m_snore_mvl/mxv .byte W02 .byte W01 - .byte 97*se_w173_mvl/mxv + .byte 97*se_m_snore_mvl/mxv .byte W02 - .byte 102*se_w173_mvl/mxv + .byte 102*se_m_snore_mvl/mxv .byte W01 - .byte 109*se_w173_mvl/mxv + .byte 109*se_m_snore_mvl/mxv .byte W02 - .byte 113*se_w173_mvl/mxv + .byte 113*se_m_snore_mvl/mxv .byte W01 - .byte 120*se_w173_mvl/mxv + .byte 120*se_m_snore_mvl/mxv .byte W05 .byte FINE @********************** Track 2 **********************@ -se_w173_2: - .byte VOL , 120*se_w173_mvl/mxv - .byte KEYSH , se_w173_key+0 +se_m_snore_2: + .byte VOL , 120*se_m_snore_mvl/mxv + .byte KEYSH , se_m_snore_key+0 .byte VOICE , 27 .byte N01 , En2 , v052 .byte W02 @@ -91,15 +91,15 @@ se_w173_2: @******************************************************@ .align 2 -se_w173: +se_m_snore: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w173_pri @ Priority - .byte se_w173_rev @ Reverb. + .byte se_m_snore_pri @ Priority + .byte se_m_snore_rev @ Reverb. - .word se_w173_grp + .word se_m_snore_grp - .word se_w173_1 - .word se_w173_2 + .word se_m_snore_1 + .word se_m_snore_2 .end diff --git a/sound/songs/se_w076.s b/sound/songs/se_m_solar_beam.s similarity index 68% rename from sound/songs/se_w076.s rename to sound/songs/se_m_solar_beam.s index 82508b7749..c260c332ab 100644 --- a/sound/songs/se_w076.s +++ b/sound/songs/se_m_solar_beam.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ se_w076_grp, voicegroup128 - .equ se_w076_pri, 4 - .equ se_w076_rev, reverb_set+50 - .equ se_w076_mvl, 127 - .equ se_w076_key, 0 - .equ se_w076_tbs, 1 - .equ se_w076_exg, 0 - .equ se_w076_cmp, 1 + .equ se_m_solar_beam_grp, voicegroup128 + .equ se_m_solar_beam_pri, 4 + .equ se_m_solar_beam_rev, reverb_set+50 + .equ se_m_solar_beam_mvl, 127 + .equ se_m_solar_beam_key, 0 + .equ se_m_solar_beam_tbs, 1 + .equ se_m_solar_beam_exg, 0 + .equ se_m_solar_beam_cmp, 1 .section .rodata - .global se_w076 + .global se_m_solar_beam .align 2 @********************** Track 1 **********************@ -se_w076_1: - .byte KEYSH , se_w076_key+0 - .byte TEMPO , 150*se_w076_tbs/2 +se_m_solar_beam_1: + .byte KEYSH , se_m_solar_beam_key+0 + .byte TEMPO , 150*se_m_solar_beam_tbs/2 .byte VOICE , 36 .byte BENDR , 24 - .byte VOL , 25*se_w076_mvl/mxv + .byte VOL , 25*se_m_solar_beam_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+63 .byte TIE , Cn4 , v112 .byte W04 - .byte VOL , 40*se_w076_mvl/mxv + .byte VOL , 40*se_m_solar_beam_mvl/mxv .byte W02 .byte PAN , c_v-4 .byte BEND , c_v+52 .byte W03 - .byte VOL , 55*se_w076_mvl/mxv + .byte VOL , 55*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte BEND , c_v+41 .byte W03 - .byte VOL , 80*se_w076_mvl/mxv + .byte VOL , 80*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte BEND , c_v+30 @@ -43,7 +43,7 @@ se_w076_1: .byte PAN , c_v+0 .byte BEND , c_v+22 .byte W01 - .byte VOL , 100*se_w076_mvl/mxv + .byte VOL , 100*se_m_solar_beam_mvl/mxv .byte W05 .byte PAN , c_v+4 .byte BEND , c_v+63 @@ -114,36 +114,36 @@ se_w076_1: .byte c_v-10 .byte BEND , c_v-18 .byte W03 - .byte VOL , 89*se_w076_mvl/mxv + .byte VOL , 89*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W02 - .byte VOL , 74*se_w076_mvl/mxv + .byte VOL , 74*se_m_solar_beam_mvl/mxv .byte BEND , c_v-25 .byte W04 .byte PAN , c_v+0 .byte W02 - .byte VOL , 62*se_w076_mvl/mxv + .byte VOL , 62*se_m_solar_beam_mvl/mxv .byte W01 .byte BEND , c_v-32 .byte W03 .byte PAN , c_v+4 .byte W01 - .byte VOL , 45*se_w076_mvl/mxv + .byte VOL , 45*se_m_solar_beam_mvl/mxv .byte W01 .byte BEND , c_v-40 .byte W04 - .byte VOL , 28*se_w076_mvl/mxv + .byte VOL , 28*se_m_solar_beam_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v-49 .byte W03 .byte c_v-64 .byte W01 - .byte VOL , 10*se_w076_mvl/mxv + .byte VOL , 10*se_m_solar_beam_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W02 - .byte VOL , 5*se_w076_mvl/mxv + .byte VOL , 5*se_m_solar_beam_mvl/mxv .byte W04 .byte EOT .byte FINE @@ -151,14 +151,14 @@ se_w076_1: @******************************************************@ .align 2 -se_w076: +se_m_solar_beam: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w076_pri @ Priority - .byte se_w076_rev @ Reverb. + .byte se_m_solar_beam_pri @ Priority + .byte se_m_solar_beam_rev @ Reverb. - .word se_w076_grp + .word se_m_solar_beam_grp - .word se_w076_1 + .word se_m_solar_beam_1 .end diff --git a/sound/songs/se_w255.s b/sound/songs/se_m_spit_up.s similarity index 63% rename from sound/songs/se_w255.s rename to sound/songs/se_m_spit_up.s index 73169ec427..5d96c7b869 100644 --- a/sound/songs/se_w255.s +++ b/sound/songs/se_m_spit_up.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w255_grp, voicegroup128 - .equ se_w255_pri, 4 - .equ se_w255_rev, reverb_set+50 - .equ se_w255_mvl, 127 - .equ se_w255_key, 0 - .equ se_w255_tbs, 1 - .equ se_w255_exg, 0 - .equ se_w255_cmp, 1 + .equ se_m_spit_up_grp, voicegroup128 + .equ se_m_spit_up_pri, 4 + .equ se_m_spit_up_rev, reverb_set+50 + .equ se_m_spit_up_mvl, 127 + .equ se_m_spit_up_key, 0 + .equ se_m_spit_up_tbs, 1 + .equ se_m_spit_up_exg, 0 + .equ se_m_spit_up_cmp, 1 .section .rodata - .global se_w255 + .global se_m_spit_up .align 2 @********************** Track 1 **********************@ -se_w255_1: - .byte KEYSH , se_w255_key+0 - .byte TEMPO , 150*se_w255_tbs/2 +se_m_spit_up_1: + .byte KEYSH , se_m_spit_up_key+0 + .byte TEMPO , 150*se_m_spit_up_tbs/2 .byte VOICE , 65 .byte BENDR , 12 - .byte VOL , 110*se_w255_mvl/mxv + .byte VOL , 110*se_m_spit_up_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N03 , Gn3 , v112 @@ -56,10 +56,10 @@ se_w255_1: @********************** Track 2 **********************@ -se_w255_2: - .byte KEYSH , se_w255_key+0 +se_m_spit_up_2: + .byte KEYSH , se_m_spit_up_key+0 .byte VOICE , 57 - .byte VOL , 110*se_w255_mvl/mxv + .byte VOL , 110*se_m_spit_up_mvl/mxv .byte N03 , En3 , v052 .byte W03 .byte W01 @@ -74,15 +74,15 @@ se_w255_2: @******************************************************@ .align 2 -se_w255: +se_m_spit_up: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w255_pri @ Priority - .byte se_w255_rev @ Reverb. + .byte se_m_spit_up_pri @ Priority + .byte se_m_spit_up_rev @ Reverb. - .word se_w255_grp + .word se_m_spit_up_grp - .word se_w255_1 - .word se_w255_2 + .word se_m_spit_up_1 + .word se_m_spit_up_2 .end diff --git a/sound/songs/se_w287b.s b/sound/songs/se_m_stat_decrease.s similarity index 84% rename from sound/songs/se_w287b.s rename to sound/songs/se_m_stat_decrease.s index a88a960cb6..5cdf8ac36d 100644 --- a/sound/songs/se_w287b.s +++ b/sound/songs/se_m_stat_decrease.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w287b_grp, voicegroup128 - .equ se_w287b_pri, 4 - .equ se_w287b_rev, reverb_set+50 - .equ se_w287b_mvl, 127 - .equ se_w287b_key, 0 - .equ se_w287b_tbs, 1 - .equ se_w287b_exg, 0 - .equ se_w287b_cmp, 1 + .equ se_m_stat_decrease_grp, voicegroup128 + .equ se_m_stat_decrease_pri, 4 + .equ se_m_stat_decrease_rev, reverb_set+50 + .equ se_m_stat_decrease_mvl, 127 + .equ se_m_stat_decrease_key, 0 + .equ se_m_stat_decrease_tbs, 1 + .equ se_m_stat_decrease_exg, 0 + .equ se_m_stat_decrease_cmp, 1 .section .rodata - .global se_w287b + .global se_m_stat_decrease .align 2 @********************** Track 1 **********************@ -se_w287b_1: - .byte KEYSH , se_w287b_key+0 - .byte TEMPO , 170*se_w287b_tbs/2 +se_m_stat_decrease_1: + .byte KEYSH , se_m_stat_decrease_key+0 + .byte TEMPO , 170*se_m_stat_decrease_tbs/2 .byte VOICE , 67 - .byte VOL , 70*se_w287b_mvl/mxv + .byte VOL , 70*se_m_stat_decrease_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+42 .byte N02 , Cs6 , v076 @@ -194,12 +194,12 @@ se_w287b_1: @********************** Track 2 **********************@ -se_w287b_2: - .byte KEYSH , se_w287b_key+0 +se_m_stat_decrease_2: + .byte KEYSH , se_m_stat_decrease_key+0 .byte VOICE , 55 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 70*se_w287b_mvl/mxv + .byte VOL , 70*se_m_stat_decrease_mvl/mxv .byte N02 , As3 , v052 .byte W03 .byte N02 @@ -257,15 +257,15 @@ se_w287b_2: @******************************************************@ .align 2 -se_w287b: +se_m_stat_decrease: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w287b_pri @ Priority - .byte se_w287b_rev @ Reverb. + .byte se_m_stat_decrease_pri @ Priority + .byte se_m_stat_decrease_rev @ Reverb. - .word se_w287b_grp + .word se_m_stat_decrease_grp - .word se_w287b_1 - .word se_w287b_2 + .word se_m_stat_decrease_1 + .word se_m_stat_decrease_2 .end diff --git a/sound/songs/se_w287.s b/sound/songs/se_m_stat_increase.s similarity index 85% rename from sound/songs/se_w287.s rename to sound/songs/se_m_stat_increase.s index 5f5cc503d1..e9eea563a0 100644 --- a/sound/songs/se_w287.s +++ b/sound/songs/se_m_stat_increase.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w287_grp, voicegroup128 - .equ se_w287_pri, 4 - .equ se_w287_rev, reverb_set+50 - .equ se_w287_mvl, 127 - .equ se_w287_key, 0 - .equ se_w287_tbs, 1 - .equ se_w287_exg, 0 - .equ se_w287_cmp, 1 + .equ se_m_stat_increase_grp, voicegroup128 + .equ se_m_stat_increase_pri, 4 + .equ se_m_stat_increase_rev, reverb_set+50 + .equ se_m_stat_increase_mvl, 127 + .equ se_m_stat_increase_key, 0 + .equ se_m_stat_increase_tbs, 1 + .equ se_m_stat_increase_exg, 0 + .equ se_m_stat_increase_cmp, 1 .section .rodata - .global se_w287 + .global se_m_stat_increase .align 2 @********************** Track 1 **********************@ -se_w287_1: - .byte KEYSH , se_w287_key+0 - .byte TEMPO , 170*se_w287_tbs/2 +se_m_stat_increase_1: + .byte KEYSH , se_m_stat_increase_key+0 + .byte TEMPO , 170*se_m_stat_increase_tbs/2 .byte VOICE , 67 - .byte VOL , 70*se_w287_mvl/mxv + .byte VOL , 70*se_m_stat_increase_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N02 , An5 , v076 @@ -206,12 +206,12 @@ se_w287_1: @********************** Track 2 **********************@ -se_w287_2: - .byte KEYSH , se_w287_key+0 +se_m_stat_increase_2: + .byte KEYSH , se_m_stat_increase_key+0 .byte VOICE , 55 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 70*se_w287_mvl/mxv + .byte VOL , 70*se_m_stat_increase_mvl/mxv .byte N02 , Cn3 , v052 .byte W03 .byte N02 @@ -269,15 +269,15 @@ se_w287_2: @******************************************************@ .align 2 -se_w287: +se_m_stat_increase: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w287_pri @ Priority - .byte se_w287_rev @ Reverb. + .byte se_m_stat_increase_pri @ Priority + .byte se_m_stat_increase_rev @ Reverb. - .word se_w287_grp + .word se_m_stat_increase_grp - .word se_w287_1 - .word se_w287_2 + .word se_m_stat_increase_1 + .word se_m_stat_increase_2 .end diff --git a/sound/songs/se_w070.s b/sound/songs/se_m_strength.s similarity index 62% rename from sound/songs/se_w070.s rename to sound/songs/se_m_strength.s index 876bad52b5..0fca48906f 100644 --- a/sound/songs/se_w070.s +++ b/sound/songs/se_m_strength.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w070_grp, voicegroup128 - .equ se_w070_pri, 4 - .equ se_w070_rev, reverb_set+50 - .equ se_w070_mvl, 127 - .equ se_w070_key, 0 - .equ se_w070_tbs, 1 - .equ se_w070_exg, 0 - .equ se_w070_cmp, 1 + .equ se_m_strength_grp, voicegroup128 + .equ se_m_strength_pri, 4 + .equ se_m_strength_rev, reverb_set+50 + .equ se_m_strength_mvl, 127 + .equ se_m_strength_key, 0 + .equ se_m_strength_tbs, 1 + .equ se_m_strength_exg, 0 + .equ se_m_strength_cmp, 1 .section .rodata - .global se_w070 + .global se_m_strength .align 2 @********************** Track 1 **********************@ -se_w070_1: - .byte KEYSH , se_w070_key+0 - .byte TEMPO , 150*se_w070_tbs/2 +se_m_strength_1: + .byte KEYSH , se_m_strength_key+0 + .byte TEMPO , 150*se_m_strength_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w070_mvl/mxv + .byte VOL , 110*se_m_strength_mvl/mxv .byte BEND , c_v+0 .byte N03 , Gn2 , v127 .byte W03 @@ -44,11 +44,11 @@ se_w070_1: @********************** Track 2 **********************@ -se_w070_2: - .byte KEYSH , se_w070_key+0 +se_m_strength_2: + .byte KEYSH , se_m_strength_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 110*se_w070_mvl/mxv + .byte VOL , 110*se_m_strength_mvl/mxv .byte N02 , Fn2 , v072 .byte W02 .byte N01 @@ -70,15 +70,15 @@ se_w070_2: @******************************************************@ .align 2 -se_w070: +se_m_strength: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w070_pri @ Priority - .byte se_w070_rev @ Reverb. + .byte se_m_strength_pri @ Priority + .byte se_m_strength_rev @ Reverb. - .word se_w070_grp + .word se_m_strength_grp - .word se_w070_1 - .word se_w070_2 + .word se_m_strength_1 + .word se_m_strength_2 .end diff --git a/sound/songs/se_w081.s b/sound/songs/se_m_string_shot.s similarity index 50% rename from sound/songs/se_w081.s rename to sound/songs/se_m_string_shot.s index 248f44c6f4..d750d26b9b 100644 --- a/sound/songs/se_w081.s +++ b/sound/songs/se_m_string_shot.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w081_grp, voicegroup128 - .equ se_w081_pri, 4 - .equ se_w081_rev, reverb_set+50 - .equ se_w081_mvl, 127 - .equ se_w081_key, 0 - .equ se_w081_tbs, 1 - .equ se_w081_exg, 0 - .equ se_w081_cmp, 1 + .equ se_m_string_shot_grp, voicegroup128 + .equ se_m_string_shot_pri, 4 + .equ se_m_string_shot_rev, reverb_set+50 + .equ se_m_string_shot_mvl, 127 + .equ se_m_string_shot_key, 0 + .equ se_m_string_shot_tbs, 1 + .equ se_m_string_shot_exg, 0 + .equ se_m_string_shot_cmp, 1 .section .rodata - .global se_w081 + .global se_m_string_shot .align 2 @********************** Track 1 **********************@ -se_w081_1: - .byte KEYSH , se_w081_key+0 - .byte TEMPO , 250*se_w081_tbs/2 +se_m_string_shot_1: + .byte KEYSH , se_m_string_shot_key+0 + .byte TEMPO , 250*se_m_string_shot_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w081_mvl/mxv + .byte VOL , 110*se_m_string_shot_mvl/mxv .byte BEND , c_v+0 .byte N48 , Fn4 , v108 .byte W03 @@ -50,31 +50,31 @@ se_w081_1: .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W06 - .byte VOL , 90*se_w081_mvl/mxv + .byte VOL , 90*se_m_string_shot_mvl/mxv .byte W03 - .byte 71*se_w081_mvl/mxv + .byte 71*se_m_string_shot_mvl/mxv .byte W03 - .byte 58*se_w081_mvl/mxv + .byte 58*se_m_string_shot_mvl/mxv .byte W03 - .byte 41*se_w081_mvl/mxv + .byte 41*se_m_string_shot_mvl/mxv .byte W03 - .byte 27*se_w081_mvl/mxv + .byte 27*se_m_string_shot_mvl/mxv .byte W03 - .byte 7*se_w081_mvl/mxv + .byte 7*se_m_string_shot_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w081: +se_m_string_shot: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w081_pri @ Priority - .byte se_w081_rev @ Reverb. + .byte se_m_string_shot_pri @ Priority + .byte se_m_string_shot_rev @ Reverb. - .word se_w081_grp + .word se_m_string_shot_grp - .word se_w081_1 + .word se_m_string_shot_1 .end diff --git a/sound/songs/se_w081b.s b/sound/songs/se_m_string_shot2.s similarity index 69% rename from sound/songs/se_w081b.s rename to sound/songs/se_m_string_shot2.s index d20162cd39..7bd0a74275 100644 --- a/sound/songs/se_w081b.s +++ b/sound/songs/se_m_string_shot2.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w081b_grp, voicegroup128 - .equ se_w081b_pri, 4 - .equ se_w081b_rev, reverb_set+50 - .equ se_w081b_mvl, 127 - .equ se_w081b_key, 0 - .equ se_w081b_tbs, 1 - .equ se_w081b_exg, 0 - .equ se_w081b_cmp, 1 + .equ se_m_string_shot2_grp, voicegroup128 + .equ se_m_string_shot2_pri, 4 + .equ se_m_string_shot2_rev, reverb_set+50 + .equ se_m_string_shot2_mvl, 127 + .equ se_m_string_shot2_key, 0 + .equ se_m_string_shot2_tbs, 1 + .equ se_m_string_shot2_exg, 0 + .equ se_m_string_shot2_cmp, 1 .section .rodata - .global se_w081b + .global se_m_string_shot2 .align 2 @********************** Track 1 **********************@ -se_w081b_1: - .byte KEYSH , se_w081b_key+0 - .byte TEMPO , 250*se_w081b_tbs/2 +se_m_string_shot2_1: + .byte KEYSH , se_m_string_shot2_key+0 + .byte TEMPO , 250*se_m_string_shot2_tbs/2 .byte VOICE , 10 .byte BENDR , 12 - .byte VOL , 105*se_w081b_mvl/mxv + .byte VOL , 105*se_m_string_shot2_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v+0 .byte N09 , En4 , v112 @@ -93,17 +93,17 @@ se_w081b_1: @********************** Track 2 **********************@ -se_w081b_2: - .byte KEYSH , se_w081b_key+0 +se_m_string_shot2_2: + .byte KEYSH , se_m_string_shot2_key+0 .byte VOICE , 5 - .byte VOL , 105*se_w081b_mvl/mxv + .byte VOL , 105*se_m_string_shot2_mvl/mxv .byte PAN , c_v+9 .byte N09 , Cn3 , v052 .byte W12 .byte PAN , c_v-7 .byte N09 , Gn2 .byte W12 -se_w081b_2_000: +se_m_string_shot2_2_000: .byte PAN , c_v+9 .byte N09 , Cn3 , v052 .byte W12 @@ -112,23 +112,23 @@ se_w081b_2_000: .byte W12 .byte PEND .byte PATT - .word se_w081b_2_000 + .word se_m_string_shot2_2_000 .byte PATT - .word se_w081b_2_000 + .word se_m_string_shot2_2_000 .byte FINE @******************************************************@ .align 2 -se_w081b: +se_m_string_shot2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w081b_pri @ Priority - .byte se_w081b_rev @ Reverb. + .byte se_m_string_shot2_pri @ Priority + .byte se_m_string_shot2_rev @ Reverb. - .word se_w081b_grp + .word se_m_string_shot2_grp - .word se_w081b_1 - .word se_w081b_2 + .word se_m_string_shot2_1 + .word se_m_string_shot2_2 .end diff --git a/sound/songs/se_w048.s b/sound/songs/se_m_supersonic.s similarity index 58% rename from sound/songs/se_w048.s rename to sound/songs/se_m_supersonic.s index 8046eae58e..f791c9b15c 100644 --- a/sound/songs/se_w048.s +++ b/sound/songs/se_m_supersonic.s @@ -1,47 +1,47 @@ .include "MPlayDef.s" - .equ se_w048_grp, voicegroup128 - .equ se_w048_pri, 4 - .equ se_w048_rev, reverb_set+50 - .equ se_w048_mvl, 127 - .equ se_w048_key, 0 - .equ se_w048_tbs, 1 - .equ se_w048_exg, 0 - .equ se_w048_cmp, 1 + .equ se_m_supersonic_grp, voicegroup128 + .equ se_m_supersonic_pri, 4 + .equ se_m_supersonic_rev, reverb_set+50 + .equ se_m_supersonic_mvl, 127 + .equ se_m_supersonic_key, 0 + .equ se_m_supersonic_tbs, 1 + .equ se_m_supersonic_exg, 0 + .equ se_m_supersonic_cmp, 1 .section .rodata - .global se_w048 + .global se_m_supersonic .align 2 @********************** Track 1 **********************@ -se_w048_1: - .byte KEYSH , se_w048_key+0 - .byte TEMPO , 150*se_w048_tbs/2 +se_m_supersonic_1: + .byte KEYSH , se_m_supersonic_key+0 + .byte TEMPO , 150*se_m_supersonic_tbs/2 .byte VOICE , 43 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 61*se_w048_mvl/mxv + .byte VOL , 61*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte N07 , Gs4 , v127 .byte W01 .byte PAN , c_v+6 - .byte VOL , 75*se_w048_mvl/mxv + .byte VOL , 75*se_m_supersonic_mvl/mxv .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-7 - .byte VOL , 93*se_w048_mvl/mxv + .byte VOL , 93*se_m_supersonic_mvl/mxv .byte BEND , c_v+2 .byte W01 .byte PAN , c_v+9 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte BEND , c_v+4 .byte W01 .byte PAN , c_v-12 .byte BEND , c_v+7 .byte W02 .byte W02 - .byte VOL , 0*se_w048_mvl/mxv + .byte VOL , 0*se_m_supersonic_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-4 .byte N32 @@ -50,68 +50,68 @@ se_w048_1: .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-7 - .byte VOL , 36*se_w048_mvl/mxv + .byte VOL , 36*se_m_supersonic_mvl/mxv .byte BEND , c_v+2 .byte W02 .byte PAN , c_v+9 - .byte VOL , 67*se_w048_mvl/mxv + .byte VOL , 67*se_m_supersonic_mvl/mxv .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-13 - .byte VOL , 84*se_w048_mvl/mxv + .byte VOL , 84*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte W01 .byte PAN , c_v+6 .byte BEND , c_v-6 .byte W01 .byte PAN , c_v-6 - .byte VOL , 92*se_w048_mvl/mxv + .byte VOL , 92*se_m_supersonic_mvl/mxv .byte BEND , c_v-8 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v-7 .byte W02 .byte PAN , c_v+6 - .byte VOL , 99*se_w048_mvl/mxv + .byte VOL , 99*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte W01 .byte PAN , c_v-7 .byte BEND , c_v-1 .byte W01 - .byte VOL , 105*se_w048_mvl/mxv + .byte VOL , 105*se_m_supersonic_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v+2 .byte W01 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-1 .byte BEND , c_v-4 .byte W02 - .byte VOL , 46*se_w048_mvl/mxv + .byte VOL , 46*se_m_supersonic_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v+6 .byte BEND , c_v+2 .byte W01 - .byte VOL , 67*se_w048_mvl/mxv + .byte VOL , 67*se_m_supersonic_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v+9 .byte BEND , c_v-4 .byte W01 - .byte VOL , 84*se_w048_mvl/mxv + .byte VOL , 84*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-6 .byte W02 - .byte VOL , 100*se_w048_mvl/mxv + .byte VOL , 100*se_m_supersonic_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-8 .byte W01 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v-7 .byte W01 @@ -121,26 +121,26 @@ se_w048_1: .byte PAN , c_v+6 .byte BEND , c_v-1 .byte W01 - .byte VOL , 101*se_w048_mvl/mxv + .byte VOL , 101*se_m_supersonic_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v+2 .byte W02 - .byte VOL , 85*se_w048_mvl/mxv + .byte VOL , 85*se_m_supersonic_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v-1 .byte W01 - .byte VOL , 75*se_w048_mvl/mxv + .byte VOL , 75*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-4 .byte W01 - .byte VOL , 48*se_w048_mvl/mxv + .byte VOL , 48*se_m_supersonic_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-6 .byte W01 - .byte VOL , 24*se_w048_mvl/mxv + .byte VOL , 24*se_m_supersonic_mvl/mxv .byte BEND , c_v-8 .byte W01 - .byte VOL , 6*se_w048_mvl/mxv + .byte VOL , 6*se_m_supersonic_mvl/mxv .byte BEND , c_v-7 .byte W02 .byte FINE @@ -148,14 +148,14 @@ se_w048_1: @******************************************************@ .align 2 -se_w048: +se_m_supersonic: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w048_pri @ Priority - .byte se_w048_rev @ Reverb. + .byte se_m_supersonic_pri @ Priority + .byte se_m_supersonic_rev @ Reverb. - .word se_w048_grp + .word se_m_supersonic_grp - .word se_w048_1 + .word se_m_supersonic_1 .end diff --git a/sound/songs/se_w057.s b/sound/songs/se_m_surf.s similarity index 59% rename from sound/songs/se_w057.s rename to sound/songs/se_m_surf.s index 6d74168cef..d3e3077826 100644 --- a/sound/songs/se_w057.s +++ b/sound/songs/se_m_surf.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w057_grp, voicegroup128 - .equ se_w057_pri, 4 - .equ se_w057_rev, reverb_set+50 - .equ se_w057_mvl, 127 - .equ se_w057_key, 0 - .equ se_w057_tbs, 1 - .equ se_w057_exg, 0 - .equ se_w057_cmp, 1 + .equ se_m_surf_grp, voicegroup128 + .equ se_m_surf_pri, 4 + .equ se_m_surf_rev, reverb_set+50 + .equ se_m_surf_mvl, 127 + .equ se_m_surf_key, 0 + .equ se_m_surf_tbs, 1 + .equ se_m_surf_exg, 0 + .equ se_m_surf_cmp, 1 .section .rodata - .global se_w057 + .global se_m_surf .align 2 @********************** Track 1 **********************@ -se_w057_1: - .byte KEYSH , se_w057_key+0 - .byte TEMPO , 150*se_w057_tbs/2 +se_m_surf_1: + .byte KEYSH , se_m_surf_key+0 + .byte TEMPO , 150*se_m_surf_tbs/2 .byte VOICE , 36 .byte BENDR , 12 - .byte VOL , 27*se_w057_mvl/mxv + .byte VOL , 27*se_m_surf_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N96 , Cn3 , v112 .byte W04 - .byte VOL , 45*se_w057_mvl/mxv + .byte VOL , 45*se_m_surf_mvl/mxv .byte W02 .byte PAN , c_v-4 .byte W02 .byte BEND , c_v+4 .byte W01 - .byte VOL , 60*se_w057_mvl/mxv + .byte VOL , 60*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte W02 .byte BEND , c_v+9 .byte W01 - .byte VOL , 88*se_w057_mvl/mxv + .byte VOL , 88*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W02 @@ -45,7 +45,7 @@ se_w057_1: .byte W04 .byte PAN , c_v+0 .byte W01 - .byte VOL , 110*se_w057_mvl/mxv + .byte VOL , 110*se_m_surf_mvl/mxv .byte W02 .byte BEND , c_v+19 .byte W03 @@ -65,29 +65,29 @@ se_w057_1: .byte W04 .byte PAN , c_v-10 .byte W01 - .byte VOL , 98*se_w057_mvl/mxv + .byte VOL , 98*se_m_surf_mvl/mxv .byte W05 - .byte 81*se_w057_mvl/mxv + .byte 81*se_m_surf_mvl/mxv .byte PAN , c_v-5 .byte BEND , c_v+12 .byte W06 - .byte VOL , 68*se_w057_mvl/mxv + .byte VOL , 68*se_m_surf_mvl/mxv .byte PAN , c_v+0 .byte W03 .byte BEND , c_v+17 .byte W01 - .byte VOL , 50*se_w057_mvl/mxv + .byte VOL , 50*se_m_surf_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W03 - .byte VOL , 31*se_w057_mvl/mxv + .byte VOL , 31*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v+11 .byte BEND , c_v+22 .byte W02 - .byte VOL , 11*se_w057_mvl/mxv + .byte VOL , 11*se_m_surf_mvl/mxv .byte W04 - .byte 6*se_w057_mvl/mxv + .byte 6*se_m_surf_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+30 .byte W06 @@ -96,14 +96,14 @@ se_w057_1: @******************************************************@ .align 2 -se_w057: +se_m_surf: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w057_pri @ Priority - .byte se_w057_rev @ Reverb. + .byte se_m_surf_pri @ Priority + .byte se_m_surf_rev @ Reverb. - .word se_w057_grp + .word se_m_surf_grp - .word se_w057_1 + .word se_m_surf_1 .end diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s new file mode 100644 index 0000000000..9b4b5756bc --- /dev/null +++ b/sound/songs/se_m_swagger.s @@ -0,0 +1,77 @@ + .include "MPlayDef.s" + + .equ se_m_swagger_grp, voicegroup128 + .equ se_m_swagger_pri, 4 + .equ se_m_swagger_rev, reverb_set+50 + .equ se_m_swagger_mvl, 127 + .equ se_m_swagger_key, 0 + .equ se_m_swagger_tbs, 1 + .equ se_m_swagger_exg, 0 + .equ se_m_swagger_cmp, 1 + + .section .rodata + .global se_m_swagger + .align 2 + +@********************** Track 1 **********************@ + +se_m_swagger_1: + .byte KEYSH , se_m_swagger_key+0 + .byte TEMPO , 190*se_m_swagger_tbs/2 + .byte VOICE , 2 + .byte BENDR , 8 + .byte PAN , c_v+0 + .byte VOL , 28*se_m_swagger_mvl/mxv + .byte BEND , c_v+0 + .byte N15 , An1 , v127 + .byte W01 + .byte VOL , 60*se_m_swagger_mvl/mxv + .byte W01 + .byte 111*se_m_swagger_mvl/mxv + .byte W01 + .byte 120*se_m_swagger_mvl/mxv + .byte W01 + .byte BEND , c_v-3 + .byte W02 + .byte PAN , c_v+5 + .byte BEND , c_v-6 + .byte W01 + .byte PAN , c_v-4 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 109*se_m_swagger_mvl/mxv + .byte PAN , c_v+9 + .byte BEND , c_v-10 + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v-14 + .byte W01 + .byte VOL , 95*se_m_swagger_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-19 + .byte W02 + .byte VOL , 71*se_m_swagger_mvl/mxv + .byte BEND , c_v-29 + .byte W01 + .byte VOL , 41*se_m_swagger_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte VOL , 15*se_m_swagger_mvl/mxv + .byte BEND , c_v-52 + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_swagger: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_swagger_pri @ Priority + .byte se_m_swagger_rev @ Reverb. + + .word se_m_swagger_grp + + .word se_m_swagger_1 + + .end diff --git a/sound/songs/se_w207b.s b/sound/songs/se_m_swagger2.s similarity index 53% rename from sound/songs/se_w207b.s rename to sound/songs/se_m_swagger2.s index 9d199e8d34..0a0d767674 100644 --- a/sound/songs/se_w207b.s +++ b/sound/songs/se_m_swagger2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w207b_grp, voicegroup128 - .equ se_w207b_pri, 4 - .equ se_w207b_rev, reverb_set+50 - .equ se_w207b_mvl, 127 - .equ se_w207b_key, 0 - .equ se_w207b_tbs, 1 - .equ se_w207b_exg, 0 - .equ se_w207b_cmp, 1 + .equ se_m_swagger2_grp, voicegroup128 + .equ se_m_swagger2_pri, 4 + .equ se_m_swagger2_rev, reverb_set+50 + .equ se_m_swagger2_mvl, 127 + .equ se_m_swagger2_key, 0 + .equ se_m_swagger2_tbs, 1 + .equ se_m_swagger2_exg, 0 + .equ se_m_swagger2_cmp, 1 .section .rodata - .global se_w207b + .global se_m_swagger2 .align 2 @********************** Track 1 **********************@ -se_w207b_1: - .byte KEYSH , se_w207b_key+0 - .byte TEMPO , 150*se_w207b_tbs/2 +se_m_swagger2_1: + .byte KEYSH , se_m_swagger2_key+0 + .byte TEMPO , 150*se_m_swagger2_tbs/2 .byte VOICE , 56 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 65*se_w207b_mvl/mxv + .byte VOL , 65*se_m_swagger2_mvl/mxv .byte BEND , c_v+8 .byte N01 , Cs6 , v112 .byte W01 @@ -43,14 +43,14 @@ se_w207b_1: @******************************************************@ .align 2 -se_w207b: +se_m_swagger2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w207b_pri @ Priority - .byte se_w207b_rev @ Reverb. + .byte se_m_swagger2_pri @ Priority + .byte se_m_swagger2_rev @ Reverb. - .word se_w207b_grp + .word se_m_swagger2_grp - .word se_w207b_1 + .word se_m_swagger2_1 .end diff --git a/sound/songs/se_w230.s b/sound/songs/se_m_sweet_scent.s similarity index 51% rename from sound/songs/se_w230.s rename to sound/songs/se_m_sweet_scent.s index b446b3448c..0abf858d27 100644 --- a/sound/songs/se_w230.s +++ b/sound/songs/se_m_sweet_scent.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w230_grp, voicegroup128 - .equ se_w230_pri, 4 - .equ se_w230_rev, reverb_set+50 - .equ se_w230_mvl, 127 - .equ se_w230_key, 0 - .equ se_w230_tbs, 1 - .equ se_w230_exg, 0 - .equ se_w230_cmp, 1 + .equ se_m_sweet_scent_grp, voicegroup128 + .equ se_m_sweet_scent_pri, 4 + .equ se_m_sweet_scent_rev, reverb_set+50 + .equ se_m_sweet_scent_mvl, 127 + .equ se_m_sweet_scent_key, 0 + .equ se_m_sweet_scent_tbs, 1 + .equ se_m_sweet_scent_exg, 0 + .equ se_m_sweet_scent_cmp, 1 .section .rodata - .global se_w230 + .global se_m_sweet_scent .align 2 @********************** Track 1 **********************@ -se_w230_1: - .byte KEYSH , se_w230_key+0 - .byte TEMPO , 150*se_w230_tbs/2 +se_m_sweet_scent_1: + .byte KEYSH , se_m_sweet_scent_key+0 + .byte TEMPO , 150*se_m_sweet_scent_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 - .byte VOL , 110*se_w230_mvl/mxv + .byte VOL , 110*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+2 .byte N36 , En3 , v096 .byte W12 @@ -61,67 +61,67 @@ se_w230_1: .byte PAN , c_v-4 .byte BEND , c_v+12 .byte W04 - .byte VOL , 103*se_w230_mvl/mxv + .byte VOL , 103*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 97*se_w230_mvl/mxv + .byte 97*se_m_sweet_scent_mvl/mxv .byte W04 .byte PAN , c_v+0 .byte BEND , c_v+12 .byte W01 - .byte VOL , 91*se_w230_mvl/mxv + .byte VOL , 91*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 81*se_w230_mvl/mxv + .byte 81*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 72*se_w230_mvl/mxv + .byte 72*se_m_sweet_scent_mvl/mxv .byte W03 .byte PAN , c_v+6 .byte BEND , c_v+13 .byte W01 - .byte VOL , 62*se_w230_mvl/mxv + .byte VOL , 62*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 51*se_w230_mvl/mxv + .byte 51*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 39*se_w230_mvl/mxv + .byte 39*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 24*se_w230_mvl/mxv + .byte 24*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 12*se_w230_mvl/mxv + .byte 12*se_m_sweet_scent_mvl/mxv .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w230_2: - .byte KEYSH , se_w230_key+0 +se_m_sweet_scent_2: + .byte KEYSH , se_m_sweet_scent_key+0 .byte VOICE , 22 .byte BENDR , 44 .byte PAN , c_v+1 - .byte VOL , 38*se_w230_mvl/mxv + .byte VOL , 38*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+1 .byte TIE , Gn3 , v100 .byte W03 - .byte VOL , 50*se_w230_mvl/mxv + .byte VOL , 50*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 62*se_w230_mvl/mxv + .byte 62*se_m_sweet_scent_mvl/mxv .byte W02 .byte BEND , c_v-1 .byte W01 - .byte VOL , 65*se_w230_mvl/mxv + .byte VOL , 65*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 74*se_w230_mvl/mxv + .byte 74*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 78*se_w230_mvl/mxv + .byte 78*se_m_sweet_scent_mvl/mxv .byte BEND , c_v-2 .byte W03 - .byte VOL , 86*se_w230_mvl/mxv + .byte VOL , 86*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 95*se_w230_mvl/mxv + .byte 95*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 105*se_w230_mvl/mxv + .byte 105*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v-4 .byte W03 - .byte VOL , 110*se_w230_mvl/mxv + .byte VOL , 110*se_m_sweet_scent_mvl/mxv .byte W13 .byte BEND , c_v-2 .byte W04 @@ -140,37 +140,37 @@ se_w230_2: .byte W14 .byte c_v+3 .byte W08 - .byte VOL , 105*se_w230_mvl/mxv + .byte VOL , 105*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 101*se_w230_mvl/mxv + .byte 101*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 96*se_w230_mvl/mxv + .byte 96*se_m_sweet_scent_mvl/mxv .byte W04 .byte BEND , c_v+2 .byte W01 - .byte VOL , 91*se_w230_mvl/mxv + .byte VOL , 91*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 86*se_w230_mvl/mxv + .byte 86*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 78*se_w230_mvl/mxv + .byte 78*se_m_sweet_scent_mvl/mxv .byte W03 .byte W02 - .byte 68*se_w230_mvl/mxv + .byte 68*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v+1 .byte W04 - .byte VOL , 58*se_w230_mvl/mxv + .byte VOL , 58*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 48*se_w230_mvl/mxv + .byte 48*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 37*se_w230_mvl/mxv + .byte 37*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+0 .byte W04 - .byte VOL , 23*se_w230_mvl/mxv + .byte VOL , 23*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v-1 .byte W02 - .byte VOL , 12*se_w230_mvl/mxv + .byte VOL , 12*se_m_sweet_scent_mvl/mxv .byte W03 .byte EOT .byte FINE @@ -178,15 +178,15 @@ se_w230_2: @******************************************************@ .align 2 -se_w230: +se_m_sweet_scent: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w230_pri @ Priority - .byte se_w230_rev @ Reverb. + .byte se_m_sweet_scent_pri @ Priority + .byte se_m_sweet_scent_rev @ Reverb. - .word se_w230_grp + .word se_m_sweet_scent_grp - .word se_w230_1 - .word se_w230_2 + .word se_m_sweet_scent_1 + .word se_m_sweet_scent_2 .end diff --git a/sound/songs/se_w129.s b/sound/songs/se_m_swift.s similarity index 56% rename from sound/songs/se_w129.s rename to sound/songs/se_m_swift.s index 61b1014626..10649a80e5 100644 --- a/sound/songs/se_w129.s +++ b/sound/songs/se_m_swift.s @@ -1,45 +1,45 @@ .include "MPlayDef.s" - .equ se_w129_grp, voicegroup128 - .equ se_w129_pri, 4 - .equ se_w129_rev, reverb_set+50 - .equ se_w129_mvl, 127 - .equ se_w129_key, 0 - .equ se_w129_tbs, 1 - .equ se_w129_exg, 0 - .equ se_w129_cmp, 1 + .equ se_m_swift_grp, voicegroup128 + .equ se_m_swift_pri, 4 + .equ se_m_swift_rev, reverb_set+50 + .equ se_m_swift_mvl, 127 + .equ se_m_swift_key, 0 + .equ se_m_swift_tbs, 1 + .equ se_m_swift_exg, 0 + .equ se_m_swift_cmp, 1 .section .rodata - .global se_w129 + .global se_m_swift .align 2 @********************** Track 1 **********************@ -se_w129_1: - .byte KEYSH , se_w129_key+0 - .byte TEMPO , 180*se_w129_tbs/2 +se_m_swift_1: + .byte KEYSH , se_m_swift_key+0 + .byte TEMPO , 180*se_m_swift_tbs/2 .byte VOICE , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 , Ds6 , v100 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 .byte W01 @@ -47,18 +47,18 @@ se_w129_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-6 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v+8 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v-10 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 , Ds6 , v056 .byte W01 @@ -66,25 +66,25 @@ se_w129_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-6 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v+8 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v-10 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w129_2: - .byte KEYSH , se_w129_key+0 +se_m_swift_2: + .byte KEYSH , se_m_swift_key+0 .byte VOICE , 53 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte W02 .byte N06 , Cn6 , v040 .byte W04 @@ -97,15 +97,15 @@ se_w129_2: @******************************************************@ .align 2 -se_w129: +se_m_swift: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w129_pri @ Priority - .byte se_w129_rev @ Reverb. + .byte se_m_swift_pri @ Priority + .byte se_m_swift_rev @ Reverb. - .word se_w129_grp + .word se_m_swift_grp - .word se_w129_1 - .word se_w129_2 + .word se_m_swift_1 + .word se_m_swift_2 .end diff --git a/sound/songs/se_w298.s b/sound/songs/se_m_teeter_dance.s similarity index 70% rename from sound/songs/se_w298.s rename to sound/songs/se_m_teeter_dance.s index d21e4b710e..8238afeb27 100644 --- a/sound/songs/se_w298.s +++ b/sound/songs/se_m_teeter_dance.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w298_grp, voicegroup128 - .equ se_w298_pri, 4 - .equ se_w298_rev, reverb_set+50 - .equ se_w298_mvl, 127 - .equ se_w298_key, 0 - .equ se_w298_tbs, 1 - .equ se_w298_exg, 0 - .equ se_w298_cmp, 1 + .equ se_m_teeter_dance_grp, voicegroup128 + .equ se_m_teeter_dance_pri, 4 + .equ se_m_teeter_dance_rev, reverb_set+50 + .equ se_m_teeter_dance_mvl, 127 + .equ se_m_teeter_dance_key, 0 + .equ se_m_teeter_dance_tbs, 1 + .equ se_m_teeter_dance_exg, 0 + .equ se_m_teeter_dance_cmp, 1 .section .rodata - .global se_w298 + .global se_m_teeter_dance .align 2 @********************** Track 1 **********************@ -se_w298_1: - .byte KEYSH , se_w298_key+0 - .byte TEMPO , 170*se_w298_tbs/2 +se_m_teeter_dance_1: + .byte KEYSH , se_m_teeter_dance_key+0 + .byte TEMPO , 170*se_m_teeter_dance_tbs/2 .byte VOICE , 37 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w298_mvl/mxv + .byte VOL , 110*se_m_teeter_dance_mvl/mxv .byte BEND , c_v-4 .byte N03 , Gn4 , v100 .byte W06 @@ -66,13 +66,13 @@ se_w298_1: @********************** Track 2 **********************@ -se_w298_2: - .byte KEYSH , se_w298_key+0 +se_m_teeter_dance_2: + .byte KEYSH , se_m_teeter_dance_key+0 .byte VOICE , 47 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte MOD , 20 - .byte VOL , 44*se_w298_mvl/mxv + .byte VOL , 44*se_m_teeter_dance_mvl/mxv .byte BEND , c_v-2 .byte W03 .byte N03 , Gn3 , v112 @@ -107,15 +107,15 @@ se_w298_2: @******************************************************@ .align 2 -se_w298: +se_m_teeter_dance: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w298_pri @ Priority - .byte se_w298_rev @ Reverb. + .byte se_m_teeter_dance_pri @ Priority + .byte se_m_teeter_dance_rev @ Reverb. - .word se_w298_grp + .word se_m_teeter_dance_grp - .word se_w298_1 - .word se_w298_2 + .word se_m_teeter_dance_1 + .word se_m_teeter_dance_2 .end diff --git a/sound/songs/se_w100.s b/sound/songs/se_m_teleport.s similarity index 74% rename from sound/songs/se_w100.s rename to sound/songs/se_m_teleport.s index e2a43dbcc8..2c4ad40e8a 100644 --- a/sound/songs/se_w100.s +++ b/sound/songs/se_m_teleport.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w100_grp, voicegroup128 - .equ se_w100_pri, 4 - .equ se_w100_rev, reverb_set+50 - .equ se_w100_mvl, 127 - .equ se_w100_key, 0 - .equ se_w100_tbs, 1 - .equ se_w100_exg, 0 - .equ se_w100_cmp, 1 + .equ se_m_teleport_grp, voicegroup128 + .equ se_m_teleport_pri, 4 + .equ se_m_teleport_rev, reverb_set+50 + .equ se_m_teleport_mvl, 127 + .equ se_m_teleport_key, 0 + .equ se_m_teleport_tbs, 1 + .equ se_m_teleport_exg, 0 + .equ se_m_teleport_cmp, 1 .section .rodata - .global se_w100 + .global se_m_teleport .align 2 @********************** Track 1 **********************@ -se_w100_1: - .byte KEYSH , se_w100_key+0 - .byte TEMPO , 150*se_w100_tbs/2 +se_m_teleport_1: + .byte KEYSH , se_m_teleport_key+0 + .byte TEMPO , 150*se_m_teleport_tbs/2 .byte VOICE , 45 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 32*se_w100_mvl/mxv + .byte VOL , 32*se_m_teleport_mvl/mxv .byte MOD , 30 .byte BEND , c_v+0 .byte N06 , Cn3 , v127 .byte W01 .byte BEND , c_v+4 .byte W01 - .byte VOL , 49*se_w100_mvl/mxv + .byte VOL , 49*se_m_teleport_mvl/mxv .byte PAN , c_v+5 .byte BEND , c_v+9 .byte W01 .byte c_v+16 .byte W01 - .byte VOL , 61*se_w100_mvl/mxv + .byte VOL , 61*se_m_teleport_mvl/mxv .byte BEND , c_v+24 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+2 .byte N06 , Dn3 , v116 .byte W01 - .byte VOL , 71*se_w100_mvl/mxv + .byte VOL , 71*se_m_teleport_mvl/mxv .byte BEND , c_v+7 .byte W01 .byte PAN , c_v-4 .byte BEND , c_v+12 .byte W01 - .byte VOL , 81*se_w100_mvl/mxv + .byte VOL , 81*se_m_teleport_mvl/mxv .byte BEND , c_v+18 .byte W01 .byte c_v+27 .byte W02 - .byte VOL , 95*se_w100_mvl/mxv + .byte VOL , 95*se_m_teleport_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+4 .byte N06 , En3 , v112 @@ -92,20 +92,20 @@ se_w100_1: .byte W01 .byte c_v+34 .byte W02 - .byte VOL , 82*se_w100_mvl/mxv + .byte VOL , 82*se_m_teleport_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+14 .byte N06 , An3 , v100 .byte W01 .byte BEND , c_v+18 .byte W01 - .byte VOL , 71*se_w100_mvl/mxv + .byte VOL , 71*se_m_teleport_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+23 .byte W01 .byte c_v+30 .byte W01 - .byte VOL , 61*se_w100_mvl/mxv + .byte VOL , 61*se_m_teleport_mvl/mxv .byte BEND , c_v+38 .byte W02 .byte PAN , c_v+0 @@ -152,14 +152,14 @@ se_w100_1: @******************************************************@ .align 2 -se_w100: +se_m_teleport: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w100_pri @ Priority - .byte se_w100_rev @ Reverb. + .byte se_m_teleport_pri @ Priority + .byte se_m_teleport_rev @ Reverb. - .word se_w100_grp + .word se_m_teleport_grp - .word se_w100_1 + .word se_m_teleport_1 .end diff --git a/sound/songs/se_w086.s b/sound/songs/se_m_thunder_wave.s similarity index 57% rename from sound/songs/se_w086.s rename to sound/songs/se_m_thunder_wave.s index 37bf21db0e..c265355006 100644 --- a/sound/songs/se_w086.s +++ b/sound/songs/se_m_thunder_wave.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w086_grp, voicegroup128 - .equ se_w086_pri, 4 - .equ se_w086_rev, reverb_set+50 - .equ se_w086_mvl, 127 - .equ se_w086_key, 0 - .equ se_w086_tbs, 1 - .equ se_w086_exg, 0 - .equ se_w086_cmp, 1 + .equ se_m_thunder_wave_grp, voicegroup128 + .equ se_m_thunder_wave_pri, 4 + .equ se_m_thunder_wave_rev, reverb_set+50 + .equ se_m_thunder_wave_mvl, 127 + .equ se_m_thunder_wave_key, 0 + .equ se_m_thunder_wave_tbs, 1 + .equ se_m_thunder_wave_exg, 0 + .equ se_m_thunder_wave_cmp, 1 .section .rodata - .global se_w086 + .global se_m_thunder_wave .align 2 @********************** Track 1 **********************@ -se_w086_1: - .byte KEYSH , se_w086_key+0 - .byte TEMPO , 150*se_w086_tbs/2 +se_m_thunder_wave_1: + .byte KEYSH , se_m_thunder_wave_key+0 + .byte TEMPO , 150*se_m_thunder_wave_tbs/2 .byte VOICE , 18 - .byte VOL , 110*se_w086_mvl/mxv + .byte VOL , 110*se_m_thunder_wave_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+32 @@ -45,21 +45,21 @@ se_w086_1: .byte W02 .byte N13 , Gn3 .byte W02 - .byte VOL , 96*se_w086_mvl/mxv + .byte VOL , 96*se_m_thunder_wave_mvl/mxv .byte W01 - .byte 85*se_w086_mvl/mxv + .byte 85*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-23 .byte W01 - .byte VOL , 66*se_w086_mvl/mxv + .byte VOL , 66*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-40 .byte W01 - .byte VOL , 36*se_w086_mvl/mxv + .byte VOL , 36*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-54 .byte W02 - .byte VOL , 12*se_w086_mvl/mxv + .byte VOL , 12*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-64 .byte W21 @@ -67,10 +67,10 @@ se_w086_1: @********************** Track 2 **********************@ -se_w086_2: - .byte KEYSH , se_w086_key+0 +se_m_thunder_wave_2: + .byte KEYSH , se_m_thunder_wave_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w086_mvl/mxv + .byte VOL , 110*se_m_thunder_wave_mvl/mxv .byte PAN , c_v-7 .byte N02 , En3 , v052 .byte W04 @@ -92,15 +92,15 @@ se_w086_2: @******************************************************@ .align 2 -se_w086: +se_m_thunder_wave: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w086_pri @ Priority - .byte se_w086_rev @ Reverb. + .byte se_m_thunder_wave_pri @ Priority + .byte se_m_thunder_wave_rev @ Reverb. - .word se_w086_grp + .word se_m_thunder_wave_grp - .word se_w086_1 - .word se_w086_2 + .word se_m_thunder_wave_1 + .word se_m_thunder_wave_2 .end diff --git a/sound/songs/se_w085.s b/sound/songs/se_m_thunderbolt.s similarity index 62% rename from sound/songs/se_w085.s rename to sound/songs/se_m_thunderbolt.s index 21e8fc6df3..3b37903131 100644 --- a/sound/songs/se_w085.s +++ b/sound/songs/se_m_thunderbolt.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w085_grp, voicegroup128 - .equ se_w085_pri, 4 - .equ se_w085_rev, reverb_set+50 - .equ se_w085_mvl, 127 - .equ se_w085_key, 0 - .equ se_w085_tbs, 1 - .equ se_w085_exg, 0 - .equ se_w085_cmp, 1 + .equ se_m_thunderbolt_grp, voicegroup128 + .equ se_m_thunderbolt_pri, 4 + .equ se_m_thunderbolt_rev, reverb_set+50 + .equ se_m_thunderbolt_mvl, 127 + .equ se_m_thunderbolt_key, 0 + .equ se_m_thunderbolt_tbs, 1 + .equ se_m_thunderbolt_exg, 0 + .equ se_m_thunderbolt_cmp, 1 .section .rodata - .global se_w085 + .global se_m_thunderbolt .align 2 @********************** Track 1 **********************@ -se_w085_1: - .byte KEYSH , se_w085_key+0 - .byte TEMPO , 220*se_w085_tbs/2 +se_m_thunderbolt_1: + .byte KEYSH , se_m_thunderbolt_key+0 + .byte TEMPO , 220*se_m_thunderbolt_tbs/2 .byte VOICE , 18 - .byte VOL , 120*se_w085_mvl/mxv + .byte VOL , 120*se_m_thunderbolt_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+32 @@ -55,23 +55,23 @@ se_w085_1: .byte W01 .byte BEND , c_v-23 .byte W02 - .byte VOL , 100*se_w085_mvl/mxv + .byte VOL , 100*se_m_thunderbolt_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-40 .byte W01 - .byte VOL , 86*se_w085_mvl/mxv + .byte VOL , 86*se_m_thunderbolt_mvl/mxv .byte W01 .byte BEND , c_v-54 .byte W01 .byte PAN , c_v+10 - .byte VOL , 68*se_w085_mvl/mxv + .byte VOL , 68*se_m_thunderbolt_mvl/mxv .byte W02 - .byte 37*se_w085_mvl/mxv + .byte 37*se_m_thunderbolt_mvl/mxv .byte BEND , c_v-64 .byte W01 .byte PAN , c_v+16 .byte W02 - .byte VOL , 17*se_w085_mvl/mxv + .byte VOL , 17*se_m_thunderbolt_mvl/mxv .byte W01 .byte PAN , c_v+10 .byte W15 @@ -79,10 +79,10 @@ se_w085_1: @********************** Track 2 **********************@ -se_w085_2: - .byte KEYSH , se_w085_key+0 +se_m_thunderbolt_2: + .byte KEYSH , se_m_thunderbolt_key+0 .byte VOICE , 5 - .byte VOL , 120*se_w085_mvl/mxv + .byte VOL , 120*se_m_thunderbolt_mvl/mxv .byte PAN , c_v-7 .byte N02 , En3 , v048 .byte W05 @@ -103,15 +103,15 @@ se_w085_2: @******************************************************@ .align 2 -se_w085: +se_m_thunderbolt: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w085_pri @ Priority - .byte se_w085_rev @ Reverb. + .byte se_m_thunderbolt_pri @ Priority + .byte se_m_thunderbolt_rev @ Reverb. - .word se_w085_grp + .word se_m_thunderbolt_grp - .word se_w085_1 - .word se_w085_2 + .word se_m_thunderbolt_1 + .word se_m_thunderbolt_2 .end diff --git a/sound/songs/se_w085b.s b/sound/songs/se_m_thunderbolt2.s similarity index 60% rename from sound/songs/se_w085b.s rename to sound/songs/se_m_thunderbolt2.s index b42007094e..5068203958 100644 --- a/sound/songs/se_w085b.s +++ b/sound/songs/se_m_thunderbolt2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w085b_grp, voicegroup128 - .equ se_w085b_pri, 4 - .equ se_w085b_rev, reverb_set+50 - .equ se_w085b_mvl, 127 - .equ se_w085b_key, 0 - .equ se_w085b_tbs, 1 - .equ se_w085b_exg, 0 - .equ se_w085b_cmp, 1 + .equ se_m_thunderbolt2_grp, voicegroup128 + .equ se_m_thunderbolt2_pri, 4 + .equ se_m_thunderbolt2_rev, reverb_set+50 + .equ se_m_thunderbolt2_mvl, 127 + .equ se_m_thunderbolt2_key, 0 + .equ se_m_thunderbolt2_tbs, 1 + .equ se_m_thunderbolt2_exg, 0 + .equ se_m_thunderbolt2_cmp, 1 .section .rodata - .global se_w085b + .global se_m_thunderbolt2 .align 2 @********************** Track 1 **********************@ -se_w085b_1: - .byte KEYSH , se_w085b_key+0 - .byte TEMPO , 220*se_w085b_tbs/2 +se_m_thunderbolt2_1: + .byte KEYSH , se_m_thunderbolt2_key+0 + .byte TEMPO , 220*se_m_thunderbolt2_tbs/2 .byte VOICE , 18 - .byte VOL , 100*se_w085b_mvl/mxv + .byte VOL , 100*se_m_thunderbolt2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -44,10 +44,10 @@ se_w085b_1: @********************** Track 2 **********************@ -se_w085b_2: - .byte KEYSH , se_w085b_key+0 +se_m_thunderbolt2_2: + .byte KEYSH , se_m_thunderbolt2_key+0 .byte VOICE , 5 - .byte VOL , 100*se_w085b_mvl/mxv + .byte VOL , 100*se_m_thunderbolt2_mvl/mxv .byte PAN , c_v+9 .byte N02 , Gn3 , v072 .byte W06 @@ -71,15 +71,15 @@ se_w085b_2: @******************************************************@ .align 2 -se_w085b: +se_m_thunderbolt2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w085b_pri @ Priority - .byte se_w085b_rev @ Reverb. + .byte se_m_thunderbolt2_pri @ Priority + .byte se_m_thunderbolt2_rev @ Reverb. - .word se_w085b_grp + .word se_m_thunderbolt2_grp - .word se_w085b_1 - .word se_w085b_2 + .word se_m_thunderbolt2_1 + .word se_m_thunderbolt2_2 .end diff --git a/sound/songs/se_w092.s b/sound/songs/se_m_toxic.s similarity index 71% rename from sound/songs/se_w092.s rename to sound/songs/se_m_toxic.s index b82665340f..0e3ebe2204 100644 --- a/sound/songs/se_w092.s +++ b/sound/songs/se_m_toxic.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w092_grp, voicegroup128 - .equ se_w092_pri, 4 - .equ se_w092_rev, reverb_set+50 - .equ se_w092_mvl, 127 - .equ se_w092_key, 0 - .equ se_w092_tbs, 1 - .equ se_w092_exg, 0 - .equ se_w092_cmp, 1 + .equ se_m_toxic_grp, voicegroup128 + .equ se_m_toxic_pri, 4 + .equ se_m_toxic_rev, reverb_set+50 + .equ se_m_toxic_mvl, 127 + .equ se_m_toxic_key, 0 + .equ se_m_toxic_tbs, 1 + .equ se_m_toxic_exg, 0 + .equ se_m_toxic_cmp, 1 .section .rodata - .global se_w092 + .global se_m_toxic .align 2 @********************** Track 1 **********************@ -se_w092_1: - .byte KEYSH , se_w092_key+0 - .byte TEMPO , 150*se_w092_tbs/2 +se_m_toxic_1: + .byte KEYSH , se_m_toxic_key+0 + .byte TEMPO , 150*se_m_toxic_tbs/2 .byte VOICE , 31 - .byte VOL , 110*se_w092_mvl/mxv + .byte VOL , 110*se_m_toxic_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -74,14 +74,14 @@ se_w092_1: @******************************************************@ .align 2 -se_w092: +se_m_toxic: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w092_pri @ Priority - .byte se_w092_rev @ Reverb. + .byte se_m_toxic_pri @ Priority + .byte se_m_toxic_rev @ Reverb. - .word se_w092_grp + .word se_m_toxic_grp - .word se_w092_1 + .word se_m_toxic_1 .end diff --git a/sound/songs/se_w161.s b/sound/songs/se_m_tri_attack.s similarity index 50% rename from sound/songs/se_w161.s rename to sound/songs/se_m_tri_attack.s index 8b378b1218..448998e779 100644 --- a/sound/songs/se_w161.s +++ b/sound/songs/se_m_tri_attack.s @@ -1,40 +1,40 @@ .include "MPlayDef.s" - .equ se_w161_grp, voicegroup128 - .equ se_w161_pri, 4 - .equ se_w161_rev, reverb_set+50 - .equ se_w161_mvl, 127 - .equ se_w161_key, 0 - .equ se_w161_tbs, 1 - .equ se_w161_exg, 0 - .equ se_w161_cmp, 1 + .equ se_m_tri_attack_grp, voicegroup128 + .equ se_m_tri_attack_pri, 4 + .equ se_m_tri_attack_rev, reverb_set+50 + .equ se_m_tri_attack_mvl, 127 + .equ se_m_tri_attack_key, 0 + .equ se_m_tri_attack_tbs, 1 + .equ se_m_tri_attack_exg, 0 + .equ se_m_tri_attack_cmp, 1 .section .rodata - .global se_w161 + .global se_m_tri_attack .align 2 @********************** Track 1 **********************@ -se_w161_1: - .byte KEYSH , se_w161_key+0 - .byte TEMPO , 220*se_w161_tbs/2 +se_m_tri_attack_1: + .byte KEYSH , se_m_tri_attack_key+0 + .byte TEMPO , 220*se_m_tri_attack_tbs/2 .byte VOICE , 58 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 19*se_w161_mvl/mxv + .byte VOL , 19*se_m_tri_attack_mvl/mxv .byte BEND , c_v-32 .byte N16 , Gn1 , v127 .byte W01 - .byte VOL , 43*se_w161_mvl/mxv + .byte VOL , 43*se_m_tri_attack_mvl/mxv .byte BEND , c_v-20 .byte W01 - .byte VOL , 72*se_w161_mvl/mxv + .byte VOL , 72*se_m_tri_attack_mvl/mxv .byte BEND , c_v-8 .byte W01 - .byte VOL , 92*se_w161_mvl/mxv + .byte VOL , 92*se_m_tri_attack_mvl/mxv .byte BEND , c_v+7 .byte W01 - .byte VOL , 109*se_w161_mvl/mxv + .byte VOL , 109*se_m_tri_attack_mvl/mxv .byte BEND , c_v+19 .byte W02 .byte c_v+28 @@ -43,29 +43,29 @@ se_w161_1: .byte W01 .byte c_v+28 .byte W01 - .byte VOL , 102*se_w161_mvl/mxv + .byte VOL , 102*se_m_tri_attack_mvl/mxv .byte BEND , c_v+19 .byte W01 - .byte VOL , 88*se_w161_mvl/mxv + .byte VOL , 88*se_m_tri_attack_mvl/mxv .byte BEND , c_v+5 .byte W02 - .byte VOL , 69*se_w161_mvl/mxv + .byte VOL , 69*se_m_tri_attack_mvl/mxv .byte BEND , c_v-9 .byte W01 - .byte VOL , 37*se_w161_mvl/mxv + .byte VOL , 37*se_m_tri_attack_mvl/mxv .byte BEND , c_v-20 .byte W01 - .byte VOL , 17*se_w161_mvl/mxv + .byte VOL , 17*se_m_tri_attack_mvl/mxv .byte BEND , c_v-34 .byte W10 .byte FINE @********************** Track 2 **********************@ -se_w161_2: - .byte KEYSH , se_w161_key+0 +se_m_tri_attack_2: + .byte KEYSH , se_m_tri_attack_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w161_mvl/mxv + .byte VOL , 110*se_m_tri_attack_mvl/mxv .byte N02 , Gs3 , v032 .byte W02 .byte Gn3 @@ -85,15 +85,15 @@ se_w161_2: @******************************************************@ .align 2 -se_w161: +se_m_tri_attack: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w161_pri @ Priority - .byte se_w161_rev @ Reverb. + .byte se_m_tri_attack_pri @ Priority + .byte se_m_tri_attack_rev @ Reverb. - .word se_w161_grp + .word se_m_tri_attack_grp - .word se_w161_1 - .word se_w161_2 + .word se_m_tri_attack_1 + .word se_m_tri_attack_2 .end diff --git a/sound/songs/se_w161b.s b/sound/songs/se_m_tri_attack2.s similarity index 64% rename from sound/songs/se_w161b.s rename to sound/songs/se_m_tri_attack2.s index 87c27eb7ec..0afade13c6 100644 --- a/sound/songs/se_w161b.s +++ b/sound/songs/se_m_tri_attack2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w161b_grp, voicegroup128 - .equ se_w161b_pri, 4 - .equ se_w161b_rev, reverb_set+50 - .equ se_w161b_mvl, 127 - .equ se_w161b_key, 0 - .equ se_w161b_tbs, 1 - .equ se_w161b_exg, 0 - .equ se_w161b_cmp, 1 + .equ se_m_tri_attack2_grp, voicegroup128 + .equ se_m_tri_attack2_pri, 4 + .equ se_m_tri_attack2_rev, reverb_set+50 + .equ se_m_tri_attack2_mvl, 127 + .equ se_m_tri_attack2_key, 0 + .equ se_m_tri_attack2_tbs, 1 + .equ se_m_tri_attack2_exg, 0 + .equ se_m_tri_attack2_cmp, 1 .section .rodata - .global se_w161b + .global se_m_tri_attack2 .align 2 @********************** Track 1 **********************@ -se_w161b_1: - .byte KEYSH , se_w161b_key+0 - .byte TEMPO , 220*se_w161b_tbs/2 +se_m_tri_attack2_1: + .byte KEYSH , se_m_tri_attack2_key+0 + .byte TEMPO , 220*se_m_tri_attack2_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w161b_mvl/mxv + .byte VOL , 110*se_m_tri_attack2_mvl/mxv .byte BEND , c_v+0 .byte N09 , An3 , v127 .byte W03 @@ -65,28 +65,28 @@ se_w161b_1: .byte PAN , c_v+0 .byte BEND , c_v-22 .byte W06 - .byte VOL , 103*se_w161b_mvl/mxv + .byte VOL , 103*se_m_tri_attack2_mvl/mxv .byte PAN , c_v+10 .byte W03 .byte BEND , c_v-32 .byte W03 .byte PAN , c_v+0 .byte W03 - .byte VOL , 95*se_w161b_mvl/mxv + .byte VOL , 95*se_m_tri_attack2_mvl/mxv .byte BEND , c_v-38 .byte W03 .byte PAN , c_v-9 .byte W05 .byte BEND , c_v-45 .byte W01 - .byte VOL , 66*se_w161b_mvl/mxv + .byte VOL , 66*se_m_tri_attack2_mvl/mxv .byte PAN , c_v+0 .byte W05 .byte c_v+10 .byte W01 .byte BEND , c_v-52 .byte W03 - .byte VOL , 21*se_w161b_mvl/mxv + .byte VOL , 21*se_m_tri_attack2_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W04 @@ -94,10 +94,10 @@ se_w161b_1: @********************** Track 2 **********************@ -se_w161b_2: - .byte KEYSH , se_w161b_key+0 +se_m_tri_attack2_2: + .byte KEYSH , se_m_tri_attack2_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w161b_mvl/mxv + .byte VOL , 110*se_m_tri_attack2_mvl/mxv .byte N06 , Cn3 , v060 .byte W09 .byte N15 @@ -110,15 +110,15 @@ se_w161b_2: @******************************************************@ .align 2 -se_w161b: +se_m_tri_attack2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w161b_pri @ Priority - .byte se_w161b_rev @ Reverb. + .byte se_m_tri_attack2_pri @ Priority + .byte se_m_tri_attack2_rev @ Reverb. - .word se_w161b_grp + .word se_m_tri_attack2_grp - .word se_w161b_1 - .word se_w161b_2 + .word se_m_tri_attack2_1 + .word se_m_tri_attack2_2 .end diff --git a/sound/songs/se_w239.s b/sound/songs/se_m_twister.s similarity index 60% rename from sound/songs/se_w239.s rename to sound/songs/se_m_twister.s index fc18c1d5c6..e95e9b3224 100644 --- a/sound/songs/se_w239.s +++ b/sound/songs/se_m_twister.s @@ -1,44 +1,44 @@ .include "MPlayDef.s" - .equ se_w239_grp, voicegroup128 - .equ se_w239_pri, 4 - .equ se_w239_rev, reverb_set+50 - .equ se_w239_mvl, 127 - .equ se_w239_key, 0 - .equ se_w239_tbs, 1 - .equ se_w239_exg, 0 - .equ se_w239_cmp, 1 + .equ se_m_twister_grp, voicegroup128 + .equ se_m_twister_pri, 4 + .equ se_m_twister_rev, reverb_set+50 + .equ se_m_twister_mvl, 127 + .equ se_m_twister_key, 0 + .equ se_m_twister_tbs, 1 + .equ se_m_twister_exg, 0 + .equ se_m_twister_cmp, 1 .section .rodata - .global se_w239 + .global se_m_twister .align 2 @********************** Track 1 **********************@ -se_w239_1: - .byte KEYSH , se_w239_key+0 - .byte TEMPO , 150*se_w239_tbs/2 +se_m_twister_1: + .byte KEYSH , se_m_twister_key+0 + .byte TEMPO , 150*se_m_twister_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 67*se_w239_mvl/mxv + .byte VOL , 67*se_m_twister_mvl/mxv .byte BEND , c_v+0 .byte TIE , Dn2 , v127 .byte W03 - .byte VOL , 83*se_w239_mvl/mxv + .byte VOL , 83*se_m_twister_mvl/mxv .byte BEND , c_v+22 .byte W03 - .byte VOL , 88*se_w239_mvl/mxv + .byte VOL , 88*se_m_twister_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 95*se_w239_mvl/mxv + .byte VOL , 95*se_m_twister_mvl/mxv .byte W02 .byte BEND , c_v+8 .byte W01 - .byte VOL , 105*se_w239_mvl/mxv + .byte VOL , 105*se_m_twister_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 115*se_w239_mvl/mxv + .byte VOL , 115*se_m_twister_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W01 @@ -101,7 +101,7 @@ se_w239_1: .byte PAN , c_v-8 .byte W03 .byte c_v-11 - .byte VOL , 103*se_w239_mvl/mxv + .byte VOL , 103*se_m_twister_mvl/mxv .byte W03 .byte PAN , c_v-17 .byte W01 @@ -109,41 +109,41 @@ se_w239_1: .byte W05 .byte PAN , c_v-9 .byte W01 - .byte VOL , 97*se_w239_mvl/mxv + .byte VOL , 97*se_m_twister_mvl/mxv .byte W05 .byte PAN , c_v-3 .byte W01 .byte BEND , c_v+12 .byte W02 .byte PAN , c_v+6 - .byte VOL , 88*se_w239_mvl/mxv + .byte VOL , 88*se_m_twister_mvl/mxv .byte W03 .byte PAN , c_v+10 .byte W02 .byte BEND , c_v+7 .byte W02 - .byte VOL , 79*se_w239_mvl/mxv + .byte VOL , 79*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v+16 .byte W04 - .byte VOL , 62*se_w239_mvl/mxv + .byte VOL , 62*se_m_twister_mvl/mxv .byte BEND , c_v+0 .byte W02 .byte PAN , c_v+13 .byte W04 - .byte VOL , 45*se_w239_mvl/mxv + .byte VOL , 45*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v+8 .byte W01 .byte BEND , c_v-7 .byte W01 - .byte VOL , 33*se_w239_mvl/mxv + .byte VOL , 33*se_m_twister_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W03 .byte c_v-8 .byte W01 - .byte VOL , 18*se_w239_mvl/mxv + .byte VOL , 18*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v-11 .byte W03 @@ -152,43 +152,43 @@ se_w239_1: @********************** Track 2 **********************@ -se_w239_2: - .byte KEYSH , se_w239_key+0 +se_m_twister_2: + .byte KEYSH , se_m_twister_key+0 .byte VOICE , 25 - .byte VOL , 67*se_w239_mvl/mxv + .byte VOL , 67*se_m_twister_mvl/mxv .byte TIE , Gs4 , v012 .byte W03 - .byte VOL , 83*se_w239_mvl/mxv + .byte VOL , 83*se_m_twister_mvl/mxv .byte W03 - .byte 88*se_w239_mvl/mxv + .byte 88*se_m_twister_mvl/mxv .byte W03 - .byte 95*se_w239_mvl/mxv + .byte 95*se_m_twister_mvl/mxv .byte W03 - .byte 105*se_w239_mvl/mxv + .byte 105*se_m_twister_mvl/mxv .byte W03 - .byte 115*se_w239_mvl/mxv + .byte 115*se_m_twister_mvl/mxv .byte W09 .byte W24 .byte W24 .byte W24 .byte W21 - .byte 103*se_w239_mvl/mxv + .byte 103*se_m_twister_mvl/mxv .byte W03 .byte W07 - .byte 97*se_w239_mvl/mxv + .byte 97*se_m_twister_mvl/mxv .byte W08 - .byte 88*se_w239_mvl/mxv + .byte 88*se_m_twister_mvl/mxv .byte W07 - .byte 79*se_w239_mvl/mxv + .byte 79*se_m_twister_mvl/mxv .byte W02 .byte W04 - .byte 62*se_w239_mvl/mxv + .byte 62*se_m_twister_mvl/mxv .byte W06 - .byte 45*se_w239_mvl/mxv + .byte 45*se_m_twister_mvl/mxv .byte W04 - .byte 33*se_w239_mvl/mxv + .byte 33*se_m_twister_mvl/mxv .byte W05 - .byte 18*se_w239_mvl/mxv + .byte 18*se_m_twister_mvl/mxv .byte W05 .byte EOT .byte FINE @@ -196,15 +196,15 @@ se_w239_2: @******************************************************@ .align 2 -se_w239: +se_m_twister: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w239_pri @ Priority - .byte se_w239_rev @ Reverb. + .byte se_m_twister_pri @ Priority + .byte se_m_twister_rev @ Reverb. - .word se_w239_grp + .word se_m_twister_grp - .word se_w239_1 - .word se_w239_2 + .word se_m_twister_1 + .word se_m_twister_2 .end diff --git a/sound/songs/se_w253.s b/sound/songs/se_m_uproar.s similarity index 53% rename from sound/songs/se_w253.s rename to sound/songs/se_m_uproar.s index e33de45500..c60cccee4e 100644 --- a/sound/songs/se_w253.s +++ b/sound/songs/se_m_uproar.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ se_w253_grp, voicegroup128 - .equ se_w253_pri, 4 - .equ se_w253_rev, reverb_set+50 - .equ se_w253_mvl, 127 - .equ se_w253_key, 0 - .equ se_w253_tbs, 1 - .equ se_w253_exg, 0 - .equ se_w253_cmp, 1 + .equ se_m_uproar_grp, voicegroup128 + .equ se_m_uproar_pri, 4 + .equ se_m_uproar_rev, reverb_set+50 + .equ se_m_uproar_mvl, 127 + .equ se_m_uproar_key, 0 + .equ se_m_uproar_tbs, 1 + .equ se_m_uproar_exg, 0 + .equ se_m_uproar_cmp, 1 .section .rodata - .global se_w253 + .global se_m_uproar .align 2 @********************** Track 1 **********************@ -se_w253_1: - .byte KEYSH , se_w253_key+0 - .byte TEMPO , 150*se_w253_tbs/2 +se_m_uproar_1: + .byte KEYSH , se_m_uproar_key+0 + .byte TEMPO , 150*se_m_uproar_tbs/2 .byte VOICE , 60 .byte BENDR , 12 - .byte VOL , 25*se_w253_mvl/mxv + .byte VOL , 25*se_m_uproar_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N24 , Gs2 , v127 .byte W01 .byte PAN , c_v+2 - .byte VOL , 51*se_w253_mvl/mxv + .byte VOL , 51*se_m_uproar_mvl/mxv .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w253_mvl/mxv + .byte VOL , 74*se_m_uproar_mvl/mxv .byte W01 - .byte 89*se_w253_mvl/mxv + .byte 89*se_m_uproar_mvl/mxv .byte BEND , c_v+1 .byte W01 .byte PAN , c_v+2 - .byte VOL , 100*se_w253_mvl/mxv + .byte VOL , 100*se_m_uproar_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W01 @@ -57,30 +57,30 @@ se_w253_1: .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 85*se_w253_mvl/mxv + .byte VOL , 85*se_m_uproar_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 - .byte VOL , 62*se_w253_mvl/mxv + .byte VOL , 62*se_m_uproar_mvl/mxv .byte W01 - .byte 33*se_w253_mvl/mxv + .byte 33*se_m_uproar_mvl/mxv .byte W01 .byte PAN , c_v-2 - .byte VOL , 11*se_w253_mvl/mxv + .byte VOL , 11*se_m_uproar_mvl/mxv .byte W02 .byte FINE @******************************************************@ .align 2 -se_w253: +se_m_uproar: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w253_pri @ Priority - .byte se_w253_rev @ Reverb. + .byte se_m_uproar_pri @ Priority + .byte se_m_uproar_rev @ Reverb. - .word se_w253_grp + .word se_m_uproar_grp - .word se_w253_1 + .word se_m_uproar_1 .end diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s new file mode 100644 index 0000000000..c89d003b6e --- /dev/null +++ b/sound/songs/se_m_vital_throw.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_m_vital_throw_grp, voicegroup128 + .equ se_m_vital_throw_pri, 4 + .equ se_m_vital_throw_rev, reverb_set+50 + .equ se_m_vital_throw_mvl, 127 + .equ se_m_vital_throw_key, 0 + .equ se_m_vital_throw_tbs, 1 + .equ se_m_vital_throw_exg, 0 + .equ se_m_vital_throw_cmp, 1 + + .section .rodata + .global se_m_vital_throw + .align 2 + +@********************** Track 1 **********************@ + +se_m_vital_throw_1: + .byte KEYSH , se_m_vital_throw_key+0 + .byte TEMPO , 220*se_m_vital_throw_tbs/2 + .byte VOICE , 22 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+16 + .byte BEND , c_v+46 + .byte N09 , Cn3 , v127 + .byte W03 + .byte VOL , 104*se_m_vital_throw_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+23 + .byte W03 + .byte VOL , 93*se_m_vital_throw_mvl/mxv + .byte PAN , c_v-16 + .byte BEND , c_v-15 + .byte W03 + .byte VOICE , 21 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Gn4 + .byte W06 + .byte PAN , c_v+16 + .byte N03 , Cn5 + .byte W09 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_vital_throw_2: + .byte KEYSH , se_m_vital_throw_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte W09 + .byte PAN , c_v+8 + .byte N03 , Cn3 , v052 + .byte W06 + .byte PAN , c_v-7 + .byte N03 + .byte W09 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_vital_throw: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_vital_throw_pri @ Priority + .byte se_m_vital_throw_rev @ Reverb. + + .word se_m_vital_throw_grp + + .word se_m_vital_throw_1 + .word se_m_vital_throw_2 + + .end diff --git a/sound/songs/se_w233b.s b/sound/songs/se_m_vital_throw2.s similarity index 60% rename from sound/songs/se_w233b.s rename to sound/songs/se_m_vital_throw2.s index 65d256d9ae..3bffdeb258 100644 --- a/sound/songs/se_w233b.s +++ b/sound/songs/se_m_vital_throw2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w233b_grp, voicegroup128 - .equ se_w233b_pri, 4 - .equ se_w233b_rev, reverb_set+50 - .equ se_w233b_mvl, 127 - .equ se_w233b_key, 0 - .equ se_w233b_tbs, 1 - .equ se_w233b_exg, 0 - .equ se_w233b_cmp, 1 + .equ se_m_vital_throw2_grp, voicegroup128 + .equ se_m_vital_throw2_pri, 4 + .equ se_m_vital_throw2_rev, reverb_set+50 + .equ se_m_vital_throw2_mvl, 127 + .equ se_m_vital_throw2_key, 0 + .equ se_m_vital_throw2_tbs, 1 + .equ se_m_vital_throw2_exg, 0 + .equ se_m_vital_throw2_cmp, 1 .section .rodata - .global se_w233b + .global se_m_vital_throw2 .align 2 @********************** Track 1 **********************@ -se_w233b_1: - .byte KEYSH , se_w233b_key+0 - .byte TEMPO , 220*se_w233b_tbs/2 +se_m_vital_throw2_1: + .byte KEYSH , se_m_vital_throw2_key+0 + .byte TEMPO , 220*se_m_vital_throw2_tbs/2 .byte VOICE , 6 - .byte VOL , 110*se_w233b_mvl/mxv + .byte VOL , 110*se_m_vital_throw2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -57,16 +57,16 @@ se_w233b_1: .byte W01 .byte c_v-29 .byte W01 - .byte VOL , 86*se_w233b_mvl/mxv + .byte VOL , 86*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-39 .byte W02 - .byte VOL , 69*se_w233b_mvl/mxv + .byte VOL , 69*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-45 .byte W01 - .byte VOL , 53*se_w233b_mvl/mxv + .byte VOL , 53*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-56 .byte W01 - .byte VOL , 20*se_w233b_mvl/mxv + .byte VOL , 20*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-64 .byte W04 .byte c_v-64 @@ -74,12 +74,12 @@ se_w233b_1: @********************** Track 2 **********************@ -se_w233b_2: - .byte KEYSH , se_w233b_key+0 +se_m_vital_throw2_2: + .byte KEYSH , se_m_vital_throw2_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w233b_mvl/mxv + .byte VOL , 110*se_m_vital_throw2_mvl/mxv .byte PAN , c_v+9 .byte N03 , Gs2 , v052 .byte W06 @@ -94,15 +94,15 @@ se_w233b_2: @******************************************************@ .align 2 -se_w233b: +se_m_vital_throw2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w233b_pri @ Priority - .byte se_w233b_rev @ Reverb. + .byte se_m_vital_throw2_pri @ Priority + .byte se_m_vital_throw2_rev @ Reverb. - .word se_w233b_grp + .word se_m_vital_throw2_grp - .word se_w233b_1 - .word se_w233b_2 + .word se_m_vital_throw2_1 + .word se_m_vital_throw2_2 .end diff --git a/sound/songs/se_w127.s b/sound/songs/se_m_waterfall.s similarity index 62% rename from sound/songs/se_w127.s rename to sound/songs/se_m_waterfall.s index 695697698f..a07e7e9713 100644 --- a/sound/songs/se_w127.s +++ b/sound/songs/se_m_waterfall.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w127_grp, voicegroup128 - .equ se_w127_pri, 4 - .equ se_w127_rev, reverb_set+50 - .equ se_w127_mvl, 127 - .equ se_w127_key, 0 - .equ se_w127_tbs, 1 - .equ se_w127_exg, 0 - .equ se_w127_cmp, 1 + .equ se_m_waterfall_grp, voicegroup128 + .equ se_m_waterfall_pri, 4 + .equ se_m_waterfall_rev, reverb_set+50 + .equ se_m_waterfall_mvl, 127 + .equ se_m_waterfall_key, 0 + .equ se_m_waterfall_tbs, 1 + .equ se_m_waterfall_exg, 0 + .equ se_m_waterfall_cmp, 1 .section .rodata - .global se_w127 + .global se_m_waterfall .align 2 @********************** Track 1 **********************@ -se_w127_1: - .byte KEYSH , se_w127_key+0 - .byte TEMPO , 150*se_w127_tbs/2 +se_m_waterfall_1: + .byte KEYSH , se_m_waterfall_key+0 + .byte TEMPO , 150*se_m_waterfall_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w127_mvl/mxv + .byte VOL , 115*se_m_waterfall_mvl/mxv .byte BEND , c_v-18 .byte N60 , Gn2 , v127 .byte W03 @@ -54,62 +54,62 @@ se_w127_1: .byte PAN , c_v+3 .byte BEND , c_v+7 .byte W02 - .byte VOL , 109*se_w127_mvl/mxv + .byte VOL , 109*se_m_waterfall_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte BEND , c_v+10 .byte W02 - .byte VOL , 103*se_w127_mvl/mxv + .byte VOL , 103*se_m_waterfall_mvl/mxv .byte W01 .byte PAN , c_v+3 .byte BEND , c_v+13 .byte W03 - .byte VOL , 92*se_w127_mvl/mxv + .byte VOL , 92*se_m_waterfall_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+16 .byte W03 - .byte VOL , 79*se_w127_mvl/mxv + .byte VOL , 79*se_m_waterfall_mvl/mxv .byte PAN , c_v-3 .byte BEND , c_v+18 .byte W02 .byte W02 - .byte VOL , 62*se_w127_mvl/mxv + .byte VOL , 62*se_m_waterfall_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+21 .byte W04 - .byte VOL , 40*se_w127_mvl/mxv + .byte VOL , 40*se_m_waterfall_mvl/mxv .byte PAN , c_v-3 .byte BEND , c_v+26 .byte W02 - .byte VOL , 22*se_w127_mvl/mxv + .byte VOL , 22*se_m_waterfall_mvl/mxv .byte BEND , c_v+33 .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 8*se_w127_mvl/mxv + .byte VOL , 8*se_m_waterfall_mvl/mxv .byte BEND , c_v+43 .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w127_2: - .byte KEYSH , se_w127_key+0 +se_m_waterfall_2: + .byte KEYSH , se_m_waterfall_key+0 .byte VOICE , 25 - .byte VOL , 115*se_w127_mvl/mxv + .byte VOL , 115*se_m_waterfall_mvl/mxv .byte N06 , Cn3 , v040 .byte W06 .byte Gn2 .byte W06 -se_w127_2_000: +se_m_waterfall_2_000: .byte N06 , Cn3 , v040 .byte W06 .byte Gn2 .byte W06 .byte PEND .byte PATT - .word se_w127_2_000 + .word se_m_waterfall_2_000 .byte N06 , Cn3 , v032 .byte W06 .byte Gn2 @@ -123,15 +123,15 @@ se_w127_2_000: @******************************************************@ .align 2 -se_w127: +se_m_waterfall: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w127_pri @ Priority - .byte se_w127_rev @ Reverb. + .byte se_m_waterfall_pri @ Priority + .byte se_m_waterfall_rev @ Reverb. - .word se_w127_grp + .word se_m_waterfall_grp - .word se_w127_1 - .word se_w127_2 + .word se_m_waterfall_1 + .word se_m_waterfall_2 .end diff --git a/sound/songs/se_w250.s b/sound/songs/se_m_whirlpool.s similarity index 65% rename from sound/songs/se_w250.s rename to sound/songs/se_m_whirlpool.s index 20a660411d..bac3fa5bcf 100644 --- a/sound/songs/se_w250.s +++ b/sound/songs/se_m_whirlpool.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w250_grp, voicegroup128 - .equ se_w250_pri, 4 - .equ se_w250_rev, reverb_set+50 - .equ se_w250_mvl, 127 - .equ se_w250_key, 0 - .equ se_w250_tbs, 1 - .equ se_w250_exg, 0 - .equ se_w250_cmp, 1 + .equ se_m_whirlpool_grp, voicegroup128 + .equ se_m_whirlpool_pri, 4 + .equ se_m_whirlpool_rev, reverb_set+50 + .equ se_m_whirlpool_mvl, 127 + .equ se_m_whirlpool_key, 0 + .equ se_m_whirlpool_tbs, 1 + .equ se_m_whirlpool_exg, 0 + .equ se_m_whirlpool_cmp, 1 .section .rodata - .global se_w250 + .global se_m_whirlpool .align 2 @********************** Track 1 **********************@ -se_w250_1: - .byte KEYSH , se_w250_key+0 - .byte TEMPO , 150*se_w250_tbs/2 +se_m_whirlpool_1: + .byte KEYSH , se_m_whirlpool_key+0 + .byte TEMPO , 150*se_m_whirlpool_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w250_mvl/mxv + .byte VOL , 115*se_m_whirlpool_mvl/mxv .byte BEND , c_v-18 .byte TIE , Dn2 , v127 .byte W03 @@ -72,37 +72,37 @@ se_w250_1: .byte W05 .byte PAN , c_v+6 .byte W02 - .byte VOL , 103*se_w250_mvl/mxv + .byte VOL , 103*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v+0 .byte W03 .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w250_mvl/mxv + .byte VOL , 85*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v-5 .byte W04 .byte PAN , c_v+0 .byte W01 - .byte VOL , 71*se_w250_mvl/mxv + .byte VOL , 71*se_m_whirlpool_mvl/mxv .byte W02 .byte BEND , c_v-8 .byte W03 - .byte VOL , 52*se_w250_mvl/mxv + .byte VOL , 52*se_m_whirlpool_mvl/mxv .byte PAN , c_v-4 .byte W03 .byte BEND , c_v-12 .byte W01 - .byte VOL , 32*se_w250_mvl/mxv + .byte VOL , 32*se_m_whirlpool_mvl/mxv .byte W02 .byte PAN , c_v-10 .byte W03 - .byte VOL , 11*se_w250_mvl/mxv + .byte VOL , 11*se_m_whirlpool_mvl/mxv .byte BEND , c_v-19 .byte W03 .byte PAN , c_v-15 .byte W01 - .byte VOL , 6*se_w250_mvl/mxv + .byte VOL , 6*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v-28 .byte W04 @@ -112,14 +112,14 @@ se_w250_1: @******************************************************@ .align 2 -se_w250: +se_m_whirlpool: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w250_pri @ Priority - .byte se_w250_rev @ Reverb. + .byte se_m_whirlpool_pri @ Priority + .byte se_m_whirlpool_rev @ Reverb. - .word se_w250_grp + .word se_m_whirlpool_grp - .word se_w250_1 + .word se_m_whirlpool_1 .end diff --git a/sound/songs/se_w281.s b/sound/songs/se_m_yawn.s similarity index 66% rename from sound/songs/se_w281.s rename to sound/songs/se_m_yawn.s index 21f27203d5..c6af1f3610 100644 --- a/sound/songs/se_w281.s +++ b/sound/songs/se_m_yawn.s @@ -1,24 +1,24 @@ .include "MPlayDef.s" - .equ se_w281_grp, voicegroup128 - .equ se_w281_pri, 4 - .equ se_w281_rev, reverb_set+50 - .equ se_w281_mvl, 127 - .equ se_w281_key, 0 - .equ se_w281_tbs, 1 - .equ se_w281_exg, 0 - .equ se_w281_cmp, 1 + .equ se_m_yawn_grp, voicegroup128 + .equ se_m_yawn_pri, 4 + .equ se_m_yawn_rev, reverb_set+50 + .equ se_m_yawn_mvl, 127 + .equ se_m_yawn_key, 0 + .equ se_m_yawn_tbs, 1 + .equ se_m_yawn_exg, 0 + .equ se_m_yawn_cmp, 1 .section .rodata - .global se_w281 + .global se_m_yawn .align 2 @********************** Track 1 **********************@ -se_w281_1: - .byte VOL , 110*se_w281_mvl/mxv - .byte KEYSH , se_w281_key+0 - .byte TEMPO , 150*se_w281_tbs/2 +se_m_yawn_1: + .byte VOL , 110*se_m_yawn_mvl/mxv + .byte KEYSH , se_m_yawn_key+0 + .byte TEMPO , 150*se_m_yawn_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 @@ -87,41 +87,41 @@ se_w281_1: @********************** Track 2 **********************@ -se_w281_2: - .byte KEYSH , se_w281_key+0 +se_m_yawn_2: + .byte KEYSH , se_m_yawn_key+0 .byte VOICE , 66 .byte BENDR , 44 .byte PAN , c_v+1 - .byte VOL , 110*se_w281_mvl/mxv + .byte VOL , 110*se_m_yawn_mvl/mxv .byte N48 , Dn3 , v020 .byte W24 .byte W03 - .byte VOL , 103*se_w281_mvl/mxv + .byte VOL , 103*se_m_yawn_mvl/mxv .byte W04 - .byte 96*se_w281_mvl/mxv + .byte 96*se_m_yawn_mvl/mxv .byte W03 - .byte 83*se_w281_mvl/mxv + .byte 83*se_m_yawn_mvl/mxv .byte W04 - .byte 67*se_w281_mvl/mxv + .byte 67*se_m_yawn_mvl/mxv .byte W04 - .byte 49*se_w281_mvl/mxv + .byte 49*se_m_yawn_mvl/mxv .byte W03 - .byte 23*se_w281_mvl/mxv + .byte 23*se_m_yawn_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w281: +se_m_yawn: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w281_pri @ Priority - .byte se_w281_rev @ Reverb. + .byte se_m_yawn_pri @ Priority + .byte se_m_yawn_rev @ Reverb. - .word se_w281_grp + .word se_m_yawn_grp - .word se_w281_1 - .word se_w281_2 + .word se_m_yawn_1 + .word se_m_yawn_2 .end diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s deleted file mode 100644 index 50529af917..0000000000 --- a/sound/songs/se_w052.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w052_grp, voicegroup128 - .equ se_w052_pri, 4 - .equ se_w052_rev, reverb_set+50 - .equ se_w052_mvl, 127 - .equ se_w052_key, 0 - .equ se_w052_tbs, 1 - .equ se_w052_exg, 0 - .equ se_w052_cmp, 1 - - .section .rodata - .global se_w052 - .align 2 - -@********************** Track 1 **********************@ - -se_w052_1: - .byte KEYSH , se_w052_key+0 - .byte TEMPO , 150*se_w052_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 61*se_w052_mvl/mxv - .byte BEND , c_v+8 - .byte N10 , Gn3 , v127 - .byte W01 - .byte VOL , 84*se_w052_mvl/mxv - .byte W01 - .byte 97*se_w052_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 110*se_w052_mvl/mxv - .byte W01 - .byte BEND , c_v+7 - .byte W02 - .byte c_v-12 - .byte W01 - .byte VOL , 89*se_w052_mvl/mxv - .byte W01 - .byte 64*se_w052_mvl/mxv - .byte BEND , c_v-42 - .byte W01 - .byte VOL , 34*se_w052_mvl/mxv - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_w052: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w052_pri @ Priority - .byte se_w052_rev @ Reverb. - - .word se_w052_grp - - .word se_w052_1 - - .end diff --git a/sound/songs/se_w059b.s b/sound/songs/se_w059b.s deleted file mode 100644 index f127629573..0000000000 --- a/sound/songs/se_w059b.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w059b_grp, voicegroup128 - .equ se_w059b_pri, 4 - .equ se_w059b_rev, reverb_set+50 - .equ se_w059b_mvl, 127 - .equ se_w059b_key, 0 - .equ se_w059b_tbs, 1 - .equ se_w059b_exg, 0 - .equ se_w059b_cmp, 1 - - .section .rodata - .global se_w059b - .align 2 - -@********************** Track 1 **********************@ - -se_w059b_1: - .byte KEYSH , se_w059b_key+0 - .byte TEMPO , 150*se_w059b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w059b_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_w059b_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_w059b_mvl/mxv - .byte W03 - .byte 76*se_w059b_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_w059b_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_w059b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_w059b_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_w059b_mvl/mxv - .byte W03 - .byte 7*se_w059b_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w059b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w059b_pri @ Priority - .byte se_w059b_rev @ Reverb. - - .word se_w059b_grp - - .word se_w059b_1 - - .end diff --git a/sound/songs/se_w062b.s b/sound/songs/se_w062b.s deleted file mode 100644 index 75a04e448a..0000000000 --- a/sound/songs/se_w062b.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w062b_grp, voicegroup128 - .equ se_w062b_pri, 4 - .equ se_w062b_rev, reverb_set+50 - .equ se_w062b_mvl, 127 - .equ se_w062b_key, 0 - .equ se_w062b_tbs, 1 - .equ se_w062b_exg, 0 - .equ se_w062b_cmp, 1 - - .section .rodata - .global se_w062b - .align 2 - -@********************** Track 1 **********************@ - -se_w062b_1: - .byte KEYSH , se_w062b_key+0 - .byte TEMPO , 150*se_w062b_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 26*se_w062b_mvl/mxv - .byte BEND , c_v-23 - .byte N09 , Dn5 , v127 - .byte W01 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W02 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_w062b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v100 - .byte W02 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W02 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_w062b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v080 - .byte W01 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W02 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w062b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w062b_pri @ Priority - .byte se_w062b_rev @ Reverb. - - .word se_w062b_grp - - .word se_w062b_1 - - .end diff --git a/sound/songs/se_w077.s b/sound/songs/se_w077.s deleted file mode 100644 index 8dd93481a3..0000000000 --- a/sound/songs/se_w077.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w077_grp, voicegroup128 - .equ se_w077_pri, 4 - .equ se_w077_rev, reverb_set+50 - .equ se_w077_mvl, 127 - .equ se_w077_key, 0 - .equ se_w077_tbs, 1 - .equ se_w077_exg, 0 - .equ se_w077_cmp, 1 - - .section .rodata - .global se_w077 - .align 2 - -@********************** Track 1 **********************@ - -se_w077_1: - .byte KEYSH , se_w077_key+0 - .byte TEMPO , 150*se_w077_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte VOL , 55*se_w077_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N01 , Cn6 , v100 - .byte W01 - .byte VOL , 110*se_w077_mvl/mxv - .byte W01 - .byte VOICE , 36 - .byte VOL , 55*se_w077_mvl/mxv - .byte N02 , Gn6 , v080 - .byte W01 - .byte VOL , 110*se_w077_mvl/mxv - .byte W04 - .byte PAN , c_v+20 - .byte N01 , Gn6 , v024 - .byte W03 - .byte Gn6 , v016 - .byte W02 - .byte PAN , c_v-21 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w077: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w077_pri @ Priority - .byte se_w077_rev @ Reverb. - - .word se_w077_grp - - .word se_w077_1 - - .end diff --git a/sound/songs/se_w082.s b/sound/songs/se_w082.s deleted file mode 100644 index 460cdd977e..0000000000 --- a/sound/songs/se_w082.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w082_grp, voicegroup128 - .equ se_w082_pri, 4 - .equ se_w082_rev, reverb_set+50 - .equ se_w082_mvl, 127 - .equ se_w082_key, 0 - .equ se_w082_tbs, 1 - .equ se_w082_exg, 0 - .equ se_w082_cmp, 1 - - .section .rodata - .global se_w082 - .align 2 - -@********************** Track 1 **********************@ - -se_w082_1: - .byte KEYSH , se_w082_key+0 - .byte TEMPO , 150*se_w082_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+5 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An2 , v127 - .byte W02 - .byte VOL , 47*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+10 - .byte N10 , Bn2 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 88*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte VOL , 120*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+18 - .byte N10 , Cs3 - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte 88*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 20*se_w082_mvl/mxv - .byte BEND , c_v+29 - .byte N10 , Dn3 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 120*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+37 - .byte N10 , En3 - .byte W02 - .byte PAN , c_v-2 - .byte VOL , 46*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 102*se_w082_mvl/mxv - .byte W02 - .byte 120*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 20*se_w082_mvl/mxv - .byte BEND , c_v+42 - .byte N20 , Fs3 - .byte W02 - .byte VOL , 47*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 99*se_w082_mvl/mxv - .byte BEND , c_v+50 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 74*se_w082_mvl/mxv - .byte W01 - .byte BEND , c_v+56 - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 53*se_w082_mvl/mxv - .byte W03 - .byte 34*se_w082_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 15*se_w082_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_w082: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w082_pri @ Priority - .byte se_w082_rev @ Reverb. - - .word se_w082_grp - - .word se_w082_1 - - .end diff --git a/sound/songs/se_w104.s b/sound/songs/se_w104.s deleted file mode 100644 index a93b52abe2..0000000000 --- a/sound/songs/se_w104.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w104_grp, voicegroup128 - .equ se_w104_pri, 4 - .equ se_w104_rev, reverb_set+50 - .equ se_w104_mvl, 127 - .equ se_w104_key, 0 - .equ se_w104_tbs, 1 - .equ se_w104_exg, 0 - .equ se_w104_cmp, 1 - - .section .rodata - .global se_w104 - .align 2 - -@********************** Track 1 **********************@ - -se_w104_1: - .byte KEYSH , se_w104_key+0 - .byte TEMPO , 150*se_w104_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w104_mvl/mxv - .byte BEND , c_v-18 - .byte N19 , Dn3 , v108 - .byte W02 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 101*se_w104_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_w104_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_w104_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_w104_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_w104_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_w104_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_w104: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w104_pri @ Priority - .byte se_w104_rev @ Reverb. - - .word se_w104_grp - - .word se_w104_1 - - .end diff --git a/sound/songs/se_w112.s b/sound/songs/se_w112.s deleted file mode 100644 index 3b741aa414..0000000000 --- a/sound/songs/se_w112.s +++ /dev/null @@ -1,276 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w112_grp, voicegroup128 - .equ se_w112_pri, 4 - .equ se_w112_rev, reverb_set+50 - .equ se_w112_mvl, 127 - .equ se_w112_key, 0 - .equ se_w112_tbs, 1 - .equ se_w112_exg, 0 - .equ se_w112_cmp, 1 - - .section .rodata - .global se_w112 - .align 2 - -@********************** Track 1 **********************@ - -se_w112_1: - .byte KEYSH , se_w112_key+0 - .byte TEMPO , 150*se_w112_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v+3 - .byte N06 , Cn6 , v088 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-34 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-45 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn6 , v084 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v076 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v064 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v044 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v036 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v028 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_w112_2: - .byte KEYSH , se_w112_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-5 - .byte W02 - .byte N06 , An5 , v064 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v056 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 -se_w112_2_000: - .byte VOL , 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v052 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_w112_2_000 - .byte VOL , 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v048 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v044 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v040 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v036 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w112: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w112_pri @ Priority - .byte se_w112_rev @ Reverb. - - .word se_w112_grp - - .word se_w112_1 - .word se_w112_2 - - .end diff --git a/sound/songs/se_w120.s b/sound/songs/se_w120.s deleted file mode 100644 index e86fac9911..0000000000 --- a/sound/songs/se_w120.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w120_grp, voicegroup128 - .equ se_w120_pri, 4 - .equ se_w120_rev, reverb_set+50 - .equ se_w120_mvl, 127 - .equ se_w120_key, 0 - .equ se_w120_tbs, 1 - .equ se_w120_exg, 0 - .equ se_w120_cmp, 1 - - .section .rodata - .global se_w120 - .align 2 - -@********************** Track 1 **********************@ - -se_w120_1: - .byte KEYSH , se_w120_key+0 - .byte TEMPO , 150*se_w120_tbs/2 - .byte VOICE , 41 - .byte VOL , 115*se_w120_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 , v127 - .byte W01 - .byte Cn3 - .byte W01 - .byte N24 , An3 - .byte W06 - .byte PAN , c_v+6 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 102*se_w120_mvl/mxv - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 88*se_w120_mvl/mxv - .byte W03 - .byte 78*se_w120_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 67*se_w120_mvl/mxv - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte PAN , c_v+7 - .byte VOL , 45*se_w120_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 13*se_w120_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-15 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_w120: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w120_pri @ Priority - .byte se_w120_rev @ Reverb. - - .word se_w120_grp - - .word se_w120_1 - - .end diff --git a/sound/songs/se_w145b.s b/sound/songs/se_w145b.s deleted file mode 100644 index d076bd3314..0000000000 --- a/sound/songs/se_w145b.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w145b_grp, voicegroup128 - .equ se_w145b_pri, 4 - .equ se_w145b_rev, reverb_set+50 - .equ se_w145b_mvl, 127 - .equ se_w145b_key, 0 - .equ se_w145b_tbs, 1 - .equ se_w145b_exg, 0 - .equ se_w145b_cmp, 1 - - .section .rodata - .global se_w145b - .align 2 - -@********************** Track 1 **********************@ - -se_w145b_1: - .byte KEYSH , se_w145b_key+0 - .byte TEMPO , 220*se_w145b_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_w145b_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte N09 , Gn4 , v127 - .byte W02 - .byte BEND , c_v+31 - .byte W02 - .byte c_v-34 - .byte W17 - .byte FINE - -@********************** Track 2 **********************@ - -se_w145b_2: - .byte KEYSH , se_w145b_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w145b_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v044 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w145b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w145b_pri @ Priority - .byte se_w145b_rev @ Reverb. - - .word se_w145b_grp - - .word se_w145b_1 - .word se_w145b_2 - - .end diff --git a/sound/songs/se_w146.s b/sound/songs/se_w146.s deleted file mode 100644 index 824c66ac3d..0000000000 --- a/sound/songs/se_w146.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w146_grp, voicegroup128 - .equ se_w146_pri, 4 - .equ se_w146_rev, reverb_set+50 - .equ se_w146_mvl, 127 - .equ se_w146_key, 0 - .equ se_w146_tbs, 1 - .equ se_w146_exg, 0 - .equ se_w146_cmp, 1 - - .section .rodata - .global se_w146 - .align 2 - -@********************** Track 1 **********************@ - -se_w146_1: - .byte KEYSH , se_w146_key+0 - .byte TEMPO , 150*se_w146_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 5*se_w146_mvl/mxv - .byte BEND , c_v+0 - .byte N07 , Bn5 , v080 - .byte W01 - .byte VOL , 55*se_w146_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 67*se_w146_mvl/mxv - .byte PAN , c_v+22 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 90*se_w146_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-14 - .byte W02 - .byte VOL , 4*se_w146_mvl/mxv - .byte PAN , c_v-22 - .byte BEND , c_v-23 - .byte W01 - .byte PAN , c_v-13 - .byte BEND , c_v+0 - .byte N04 , Cn6 - .byte W01 - .byte VOL , 66*se_w146_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 90*se_w146_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 4*se_w146_mvl/mxv - .byte PAN , c_v+21 - .byte BEND , c_v+5 - .byte W14 - .byte VOL , 90*se_w146_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w146: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w146_pri @ Priority - .byte se_w146_rev @ Reverb. - - .word se_w146_grp - - .word se_w146_1 - - .end diff --git a/sound/songs/se_w166.s b/sound/songs/se_w166.s deleted file mode 100644 index afbe08f08a..0000000000 --- a/sound/songs/se_w166.s +++ /dev/null @@ -1,68 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w166_grp, voicegroup128 - .equ se_w166_pri, 4 - .equ se_w166_rev, reverb_set+50 - .equ se_w166_mvl, 127 - .equ se_w166_key, 0 - .equ se_w166_tbs, 1 - .equ se_w166_exg, 0 - .equ se_w166_cmp, 1 - - .section .rodata - .global se_w166 - .align 2 - -@********************** Track 1 **********************@ - -se_w166_1: - .byte KEYSH , se_w166_key+0 - .byte TEMPO , 180*se_w166_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w166_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn4 , v127 - .byte W01 - .byte VOL , 74*se_w166_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte VOICE , 31 - .byte VOL , 40*se_w166_mvl/mxv - .byte BEND , c_v-1 - .byte N03 , Cs5 - .byte W01 - .byte VOL , 64*se_w166_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 86*se_w166_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v-16 - .byte W02 - .byte VOL , 110*se_w166_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 0*se_w166_mvl/mxv - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_w166: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w166_pri @ Priority - .byte se_w166_rev @ Reverb. - - .word se_w166_grp - - .word se_w166_1 - - .end diff --git a/sound/songs/se_w172.s b/sound/songs/se_w172.s deleted file mode 100644 index 0c5ae67543..0000000000 --- a/sound/songs/se_w172.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172_grp, voicegroup128 - .equ se_w172_pri, 4 - .equ se_w172_rev, reverb_set+50 - .equ se_w172_mvl, 127 - .equ se_w172_key, 0 - .equ se_w172_tbs, 1 - .equ se_w172_exg, 0 - .equ se_w172_cmp, 1 - - .section .rodata - .global se_w172 - .align 2 - -@********************** Track 1 **********************@ - -se_w172_1: - .byte KEYSH , se_w172_key+0 - .byte TEMPO , 150*se_w172_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 22*se_w172_mvl/mxv - .byte BEND , c_v+0 - .byte N30 , Dn4 , v127 - .byte W01 - .byte VOL , 49*se_w172_mvl/mxv - .byte W01 - .byte 71*se_w172_mvl/mxv - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_w172_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 95*se_w172_mvl/mxv - .byte W02 - .byte 88*se_w172_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 93*se_w172_mvl/mxv - .byte W02 - .byte 110*se_w172_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 86*se_w172_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 63*se_w172_mvl/mxv - .byte W02 - .byte 37*se_w172_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 13*se_w172_mvl/mxv - .byte BEND , c_v-46 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w172_2: - .byte KEYSH , se_w172_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 22*se_w172_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_w172_mvl/mxv - .byte W01 - .byte 71*se_w172_mvl/mxv - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte W01 - .byte 110*se_w172_mvl/mxv - .byte W02 - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte W02 - .byte 88*se_w172_mvl/mxv - .byte W01 - .byte 93*se_w172_mvl/mxv - .byte W02 - .byte 110*se_w172_mvl/mxv - .byte W02 - .byte 86*se_w172_mvl/mxv - .byte W01 - .byte W01 - .byte 63*se_w172_mvl/mxv - .byte W02 - .byte 37*se_w172_mvl/mxv - .byte W03 - .byte 13*se_w172_mvl/mxv - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w172: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w172_pri @ Priority - .byte se_w172_rev @ Reverb. - - .word se_w172_grp - - .word se_w172_1 - .word se_w172_2 - - .end diff --git a/sound/songs/se_w172b.s b/sound/songs/se_w172b.s deleted file mode 100644 index 1d4369b003..0000000000 --- a/sound/songs/se_w172b.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172b_grp, voicegroup128 - .equ se_w172b_pri, 4 - .equ se_w172b_rev, reverb_set+50 - .equ se_w172b_mvl, 127 - .equ se_w172b_key, 0 - .equ se_w172b_tbs, 1 - .equ se_w172b_exg, 0 - .equ se_w172b_cmp, 1 - - .section .rodata - .global se_w172b - .align 2 - -@********************** Track 1 **********************@ - -se_w172b_1: - .byte KEYSH , se_w172b_key+0 - .byte TEMPO , 150*se_w172b_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w172b_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Cn4 , v127 - .byte W06 - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+2 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v+5 - .byte W03 - .byte VOL , 98*se_w172b_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+3 - .byte W03 - .byte VOL , 88*se_w172b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 68*se_w172b_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+7 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 44*se_w172b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-15 - .byte W03 - .byte VOL , 13*se_w172b_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte c_v-40 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w172b_2: - .byte KEYSH , se_w172b_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_w172b_mvl/mxv - .byte N48 , Gn2 , v032 - .byte W18 - .byte VOL , 98*se_w172b_mvl/mxv - .byte W06 - .byte 88*se_w172b_mvl/mxv - .byte W06 - .byte 68*se_w172b_mvl/mxv - .byte W06 - .byte 44*se_w172b_mvl/mxv - .byte W06 - .byte 13*se_w172b_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w172b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w172b_pri @ Priority - .byte se_w172b_rev @ Reverb. - - .word se_w172b_grp - - .word se_w172b_1 - .word se_w172b_2 - - .end diff --git a/sound/songs/se_w187.s b/sound/songs/se_w187.s deleted file mode 100644 index d6c27b89c9..0000000000 --- a/sound/songs/se_w187.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w187_grp, voicegroup128 - .equ se_w187_pri, 4 - .equ se_w187_rev, reverb_set+50 - .equ se_w187_mvl, 127 - .equ se_w187_key, 0 - .equ se_w187_tbs, 1 - .equ se_w187_exg, 0 - .equ se_w187_cmp, 1 - - .section .rodata - .global se_w187 - .align 2 - -@********************** Track 1 **********************@ - -se_w187_1: - .byte KEYSH , se_w187_key+0 - .byte TEMPO , 150*se_w187_tbs/2 - .byte VOICE , 6 - .byte BENDR , 12 - .byte VOL , 115*se_w187_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N19 , An2 , v127 - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v-12 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v-18 - .byte W01 - .byte VOL , 108*se_w187_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte c_v-22 - .byte W01 - .byte VOL , 94*se_w187_mvl/mxv - .byte W03 - .byte 78*se_w187_mvl/mxv - .byte W01 - .byte 62*se_w187_mvl/mxv - .byte W01 - .byte 40*se_w187_mvl/mxv - .byte W01 - .byte 27*se_w187_mvl/mxv - .byte W02 - .byte 12*se_w187_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w187: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w187_pri @ Priority - .byte se_w187_rev @ Reverb. - - .word se_w187_grp - - .word se_w187_1 - - .end diff --git a/sound/songs/se_w195.s b/sound/songs/se_w195.s deleted file mode 100644 index b780952482..0000000000 --- a/sound/songs/se_w195.s +++ /dev/null @@ -1,221 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w195_grp, voicegroup128 - .equ se_w195_pri, 4 - .equ se_w195_rev, reverb_set+50 - .equ se_w195_mvl, 127 - .equ se_w195_key, 0 - .equ se_w195_tbs, 1 - .equ se_w195_exg, 0 - .equ se_w195_cmp, 1 - - .section .rodata - .global se_w195 - .align 2 - -@********************** Track 1 **********************@ - -se_w195_1: - .byte KEYSH , se_w195_key+0 - .byte TEMPO , 100*se_w195_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+7 - .byte VOL , 25*se_w195_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte N48 , An3 , v112 - .byte W03 - .byte VOL , 40*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 -se_w195_1_000: - .byte VOL , 45*se_w195_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_001: - .byte VOL , 56*se_w195_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 62*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_002: - .byte VOL , 72*se_w195_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 81*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_003: - .byte VOL , 92*se_w195_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 100*se_w195_mvl/mxv - .byte W03 - .byte PEND - .byte PAN , c_v-4 - .byte W06 - .byte VOL , 82*se_w195_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 52*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte MOD , 0 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+7 - .byte W02 - .byte VOL , 33*se_w195_mvl/mxv - .byte N72 , Gs3 , v112 - .byte W03 - .byte VOL , 40*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 - .byte PATT - .word se_w195_1_000 - .byte PATT - .word se_w195_1_001 - .byte PATT - .word se_w195_1_002 - .byte PATT - .word se_w195_1_003 - .byte PAN , c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W03 - .byte VOL , 87*se_w195_mvl/mxv - .byte W03 - .byte 75*se_w195_mvl/mxv - .byte PAN , c_v+7 - .byte W03 - .byte VOL , 62*se_w195_mvl/mxv - .byte W03 - .byte 48*se_w195_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 33*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 10*se_w195_mvl/mxv - .byte W03 - .byte W01 - .byte PAN , c_v-4 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_w195_2: - .byte KEYSH , se_w195_key+0 - .byte VOICE , 73 - .byte VOL , 25*se_w195_mvl/mxv - .byte PAN , c_v-17 - .byte N48 , Cn4 , v100 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 40*se_w195_mvl/mxv - .byte W03 -se_w195_2_000: - .byte VOL , 45*se_w195_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_w195_mvl/mxv - .byte W03 - .byte PEND - .byte 56*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 72*se_w195_mvl/mxv - .byte W03 - .byte 81*se_w195_mvl/mxv - .byte W03 - .byte 92*se_w195_mvl/mxv - .byte W03 - .byte 100*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte 82*se_w195_mvl/mxv - .byte W03 - .byte 52*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte MOD , 0 - .byte N72 , Bn3 , v100 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 40*se_w195_mvl/mxv - .byte W03 - .byte PATT - .word se_w195_2_000 - .byte VOL , 56*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 72*se_w195_mvl/mxv - .byte W03 - .byte 81*se_w195_mvl/mxv - .byte W03 - .byte 92*se_w195_mvl/mxv - .byte W03 - .byte 100*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W03 - .byte 87*se_w195_mvl/mxv - .byte W03 - .byte 75*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 48*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte W03 - .byte 10*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w195: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w195_pri @ Priority - .byte se_w195_rev @ Reverb. - - .word se_w195_grp - - .word se_w195_1 - .word se_w195_2 - - .end diff --git a/sound/songs/se_w207.s b/sound/songs/se_w207.s deleted file mode 100644 index 1c0d0475b1..0000000000 --- a/sound/songs/se_w207.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w207_grp, voicegroup128 - .equ se_w207_pri, 4 - .equ se_w207_rev, reverb_set+50 - .equ se_w207_mvl, 127 - .equ se_w207_key, 0 - .equ se_w207_tbs, 1 - .equ se_w207_exg, 0 - .equ se_w207_cmp, 1 - - .section .rodata - .global se_w207 - .align 2 - -@********************** Track 1 **********************@ - -se_w207_1: - .byte KEYSH , se_w207_key+0 - .byte TEMPO , 190*se_w207_tbs/2 - .byte VOICE , 2 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 28*se_w207_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , An1 , v127 - .byte W01 - .byte VOL , 60*se_w207_mvl/mxv - .byte W01 - .byte 111*se_w207_mvl/mxv - .byte W01 - .byte 120*se_w207_mvl/mxv - .byte W01 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 109*se_w207_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-14 - .byte W01 - .byte VOL , 95*se_w207_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte W02 - .byte VOL , 71*se_w207_mvl/mxv - .byte BEND , c_v-29 - .byte W01 - .byte VOL , 41*se_w207_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte VOL , 15*se_w207_mvl/mxv - .byte BEND , c_v-52 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_w207: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w207_pri @ Priority - .byte se_w207_rev @ Reverb. - - .word se_w207_grp - - .word se_w207_1 - - .end diff --git a/sound/songs/se_w221.s b/sound/songs/se_w221.s deleted file mode 100644 index 68e9d09577..0000000000 --- a/sound/songs/se_w221.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221_grp, voicegroup128 - .equ se_w221_pri, 4 - .equ se_w221_rev, reverb_set+50 - .equ se_w221_mvl, 127 - .equ se_w221_key, 0 - .equ se_w221_tbs, 1 - .equ se_w221_exg, 0 - .equ se_w221_cmp, 1 - - .section .rodata - .global se_w221 - .align 2 - -@********************** Track 1 **********************@ - -se_w221_1: - .byte KEYSH , se_w221_key+0 - .byte TEMPO , 150*se_w221_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_w221_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N04 , Cn3 , v127 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte N18 , Gn4 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 98*se_w221_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 83*se_w221_mvl/mxv - .byte BEND , c_v+6 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 63*se_w221_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+13 - .byte W02 - .byte VOL , 44*se_w221_mvl/mxv - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 28*se_w221_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 12*se_w221_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w221_2: - .byte KEYSH , se_w221_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_w221_mvl/mxv - .byte N01 , Gn2 , v032 - .byte W02 - .byte N01 - .byte W02 - .byte N18 - .byte W03 - .byte VOL , 98*se_w221_mvl/mxv - .byte W03 - .byte 83*se_w221_mvl/mxv - .byte W04 - .byte 63*se_w221_mvl/mxv - .byte W04 - .byte 44*se_w221_mvl/mxv - .byte W02 - .byte 28*se_w221_mvl/mxv - .byte W02 - .byte 12*se_w221_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_w221: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w221_pri @ Priority - .byte se_w221_rev @ Reverb. - - .word se_w221_grp - - .word se_w221_1 - .word se_w221_2 - - .end diff --git a/sound/songs/se_w221b.s b/sound/songs/se_w221b.s deleted file mode 100644 index ed0120acf6..0000000000 --- a/sound/songs/se_w221b.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221b_grp, voicegroup128 - .equ se_w221b_pri, 4 - .equ se_w221b_rev, reverb_set+50 - .equ se_w221b_mvl, 127 - .equ se_w221b_key, 0 - .equ se_w221b_tbs, 1 - .equ se_w221b_exg, 0 - .equ se_w221b_cmp, 1 - - .section .rodata - .global se_w221b - .align 2 - -@********************** Track 1 **********************@ - -se_w221b_1: - .byte KEYSH , se_w221b_key+0 - .byte TEMPO , 150*se_w221b_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 22*se_w221b_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N96 , Gn3 , v127 - .byte W01 - .byte VOL , 49*se_w221b_mvl/mxv - .byte W01 - .byte 71*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 95*se_w221b_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 97*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 84*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 76*se_w221b_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v-24 - .byte W03 - .byte PAN , c_v-2 - .byte BEND , c_v-46 - .byte W03 - .byte VOL , 84*se_w221b_mvl/mxv - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 92*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte BEND , c_v-32 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W02 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 78*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W02 - .byte VOL , 71*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte W03 - .byte c_v+5 - .byte W03 - .byte c_v+0 - .byte VOL , 78*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+5 - .byte W02 - .byte VOL , 90*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W03 - .byte c_v-2 - .byte W01 - .byte VOL , 80*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte VOL , 83*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 63*se_w221b_mvl/mxv - .byte W03 - .byte 37*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 13*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w221b_2: - .byte KEYSH , se_w221b_key+0 - .byte VOICE , 27 - .byte VOL , 22*se_w221b_mvl/mxv - .byte N96 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_w221b_mvl/mxv - .byte W01 - .byte 71*se_w221b_mvl/mxv - .byte W01 - .byte 95*se_w221b_mvl/mxv - .byte W01 - .byte 110*se_w221b_mvl/mxv - .byte W05 - .byte 97*se_w221b_mvl/mxv - .byte W15 - .byte W24 - .byte W24 - .byte W09 - .byte 83*se_w221b_mvl/mxv - .byte W03 - .byte 63*se_w221b_mvl/mxv - .byte W03 - .byte 37*se_w221b_mvl/mxv - .byte W03 - .byte 13*se_w221b_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w221b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w221b_pri @ Priority - .byte se_w221b_rev @ Reverb. - - .word se_w221b_grp - - .word se_w221b_1 - .word se_w221b_2 - - .end diff --git a/sound/songs/se_w233.s b/sound/songs/se_w233.s deleted file mode 100644 index 84381fc0e8..0000000000 --- a/sound/songs/se_w233.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w233_grp, voicegroup128 - .equ se_w233_pri, 4 - .equ se_w233_rev, reverb_set+50 - .equ se_w233_mvl, 127 - .equ se_w233_key, 0 - .equ se_w233_tbs, 1 - .equ se_w233_exg, 0 - .equ se_w233_cmp, 1 - - .section .rodata - .global se_w233 - .align 2 - -@********************** Track 1 **********************@ - -se_w233_1: - .byte KEYSH , se_w233_key+0 - .byte TEMPO , 220*se_w233_tbs/2 - .byte VOICE , 22 - .byte VOL , 110*se_w233_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+16 - .byte BEND , c_v+46 - .byte N09 , Cn3 , v127 - .byte W03 - .byte VOL , 104*se_w233_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+23 - .byte W03 - .byte VOL , 93*se_w233_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-15 - .byte W03 - .byte VOICE , 21 - .byte VOL , 110*se_w233_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn5 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_w233_2: - .byte KEYSH , se_w233_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w233_mvl/mxv - .byte W09 - .byte PAN , c_v+8 - .byte N03 , Cn3 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W09 - .byte FINE - -@******************************************************@ - .align 2 - -se_w233: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w233_pri @ Priority - .byte se_w233_rev @ Reverb. - - .word se_w233_grp - - .word se_w233_1 - .word se_w233_2 - - .end diff --git a/sound/songs/se_w240.s b/sound/songs/se_w240.s deleted file mode 100644 index 744cc3b88e..0000000000 --- a/sound/songs/se_w240.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w240_grp, voicegroup128 - .equ se_w240_pri, 4 - .equ se_w240_rev, reverb_set+50 - .equ se_w240_mvl, 127 - .equ se_w240_key, 0 - .equ se_w240_tbs, 1 - .equ se_w240_exg, 0 - .equ se_w240_cmp, 1 - - .section .rodata - .global se_w240 - .align 2 - -@********************** Track 1 **********************@ - -se_w240_1: - .byte KEYSH , se_w240_key+0 - .byte TEMPO , 220*se_w240_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 20*se_w240_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn3 , v064 - .byte W03 - .byte VOL , 37*se_w240_mvl/mxv - .byte W03 - .byte 53*se_w240_mvl/mxv - .byte W03 - .byte 60*se_w240_mvl/mxv - .byte W03 - .byte 71*se_w240_mvl/mxv - .byte W03 - .byte 81*se_w240_mvl/mxv - .byte W03 - .byte 93*se_w240_mvl/mxv - .byte W03 - .byte 110*se_w240_mvl/mxv - .byte W03 - .byte PAN , c_v+3 - .byte W06 - .byte c_v+11 - .byte W12 - .byte c_v+20 - .byte W06 - .byte c_v+25 - .byte W12 - .byte c_v+14 - .byte W06 - .byte c_v+8 - .byte W06 - .byte W06 - .byte c_v-3 - .byte W12 - .byte c_v-16 - .byte W06 - .byte W06 - .byte c_v-26 - .byte W12 - .byte c_v-16 - .byte W06 - .byte VOL , 104*se_w240_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte VOL , 101*se_w240_mvl/mxv - .byte W03 - .byte 98*se_w240_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 93*se_w240_mvl/mxv - .byte W03 - .byte 90*se_w240_mvl/mxv - .byte PAN , c_v+14 - .byte W03 - .byte VOL , 86*se_w240_mvl/mxv - .byte W03 - .byte 83*se_w240_mvl/mxv - .byte W03 - .byte 77*se_w240_mvl/mxv - .byte W03 - .byte 73*se_w240_mvl/mxv - .byte PAN , c_v+24 - .byte W03 - .byte VOL , 66*se_w240_mvl/mxv - .byte W03 - .byte 58*se_w240_mvl/mxv - .byte W03 - .byte 44*se_w240_mvl/mxv - .byte W03 - .byte 32*se_w240_mvl/mxv - .byte PAN , c_v+15 - .byte W03 - .byte VOL , 16*se_w240_mvl/mxv - .byte W03 - .byte 1*se_w240_mvl/mxv - .byte PAN , c_v+4 - .byte W06 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_w240: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w240_pri @ Priority - .byte se_w240_rev @ Reverb. - - .word se_w240_grp - - .word se_w240_1 - - .end diff --git a/sound/songs/se_w260.s b/sound/songs/se_w260.s deleted file mode 100644 index 70e58fda19..0000000000 --- a/sound/songs/se_w260.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w260_grp, voicegroup128 - .equ se_w260_pri, 4 - .equ se_w260_rev, reverb_set+50 - .equ se_w260_mvl, 127 - .equ se_w260_key, 0 - .equ se_w260_tbs, 1 - .equ se_w260_exg, 0 - .equ se_w260_cmp, 1 - - .section .rodata - .global se_w260 - .align 2 - -@********************** Track 1 **********************@ - -se_w260_1: - .byte KEYSH , se_w260_key+0 - .byte TEMPO , 150*se_w260_tbs/2 - .byte VOICE , 41 - .byte VOL , 100*se_w260_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte Gn4 - .byte W01 - .byte N09 , En5 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 92*se_w260_mvl/mxv - .byte PAN , c_v-8 - .byte W01 - .byte VOL , 83*se_w260_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 71*se_w260_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 46*se_w260_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 22*se_w260_mvl/mxv - .byte PAN , c_v-12 - .byte BEND , c_v-15 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_w260: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w260_pri @ Priority - .byte se_w260_rev @ Reverb. - - .word se_w260_grp - - .word se_w260_1 - - .end diff --git a/sound/songs/se_w327.s b/sound/songs/se_w327.s deleted file mode 100644 index 1efa6c33f6..0000000000 --- a/sound/songs/se_w327.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w327_grp, voicegroup128 - .equ se_w327_pri, 4 - .equ se_w327_rev, reverb_set+50 - .equ se_w327_mvl, 127 - .equ se_w327_key, 0 - .equ se_w327_tbs, 1 - .equ se_w327_exg, 0 - .equ se_w327_cmp, 1 - - .section .rodata - .global se_w327 - .align 2 - -@********************** Track 1 **********************@ - -se_w327_1: - .byte KEYSH , se_w327_key+0 - .byte TEMPO , 220*se_w327_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_w327_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N02 , Cn4 , v127 - .byte W03 - .byte VOL , 104*se_w327_mvl/mxv - .byte W03 - .byte 93*se_w327_mvl/mxv - .byte PAN , c_v-6 - .byte N02 , Cn5 - .byte W03 - .byte VOL , 110*se_w327_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v060 - .byte W02 - .byte W02 - .byte BEND , c_v+0 - .byte W04 - .byte c_v+1 - .byte W03 - .byte c_v+1 - .byte W01 - .byte VOL , 105*se_w327_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 103*se_w327_mvl/mxv - .byte W02 - .byte 91*se_w327_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 77*se_w327_mvl/mxv - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 61*se_w327_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 38*se_w327_mvl/mxv - .byte W01 - .byte 15*se_w327_mvl/mxv - .byte BEND , c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w327_2: - .byte KEYSH , se_w327_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w327_mvl/mxv - .byte N02 , Cn3 , v060 - .byte W03 - .byte Gn2 - .byte W03 - .byte Gs4 - .byte W04 - .byte Gs4 , v020 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w327: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w327_pri @ Priority - .byte se_w327_rev @ Reverb. - - .word se_w327_grp - - .word se_w327_1 - .word se_w327_2 - - .end diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s deleted file mode 100644 index d8c792b172..0000000000 --- a/sound/songs/se_z_scroll.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_z_scroll_grp, voicegroup127 - .equ se_z_scroll_pri, 5 - .equ se_z_scroll_rev, reverb_set+50 - .equ se_z_scroll_mvl, 127 - .equ se_z_scroll_key, 0 - .equ se_z_scroll_tbs, 1 - .equ se_z_scroll_exg, 0 - .equ se_z_scroll_cmp, 1 - - .section .rodata - .global se_z_scroll - .align 2 - -@********************** Track 1 **********************@ - -se_z_scroll_1: - .byte KEYSH , se_z_scroll_key+0 - .byte TEMPO , 100*se_z_scroll_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 40*se_z_scroll_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Gn4 , v127 - .byte W01 - .byte Gn4 , v020 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_z_scroll: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_z_scroll_pri @ Priority - .byte se_z_scroll_rev @ Reverb. - - .word se_z_scroll_grp - - .word se_z_scroll_1 - - .end diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c index f6ebcc7265..42cc9aea3a 100644 --- a/src/AgbRfu_LinkManager.c +++ b/src/AgbRfu_LinkManager.c @@ -352,7 +352,7 @@ static bool8 rfu_LMAN_linkWatcher(u16 REQ_commandID) { for (i = 0; i < RFU_CHILD_MAX; i++) { - if ((bm_linkLossSlot >> i) & 1) + if (bm_linkLossSlot & (1 << i)) { lman.linkRecoveryTimer.active |= (1 << i); lman.linkRecoveryTimer.count[i] = lman.linkRecoveryTimer.count_max; @@ -396,7 +396,7 @@ static bool8 rfu_LMAN_linkWatcher(u16 REQ_commandID) bm_disconnectSlot = 0; for (i = 0; i < RFU_CHILD_MAX; i++) { - if ((lman.linkRecoveryTimer.active >> i) & 1 && lman.linkRecoveryTimer.count[i] && --lman.linkRecoveryTimer.count[i] == 0) + if ((lman.linkRecoveryTimer.active) & (1 << i) && lman.linkRecoveryTimer.count[i] && --lman.linkRecoveryTimer.count[i] == 0) { lman.linkRecoveryTimer.active &= ~(1 << i); bm_disconnectSlot |= (1 << i); diff --git a/src/agb_flash.c b/src/agb_flash.c index eeccf11164..f63f84509e 100644 --- a/src/agb_flash.c +++ b/src/agb_flash.c @@ -140,9 +140,9 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size) { u8 *src; u16 i; - u16 readFlash_Core_Buffer[0x40]; - u16 *funcSrc; - u16 *funcDest; + vu16 readFlash_Core_Buffer[0x40]; + vu16 *funcSrc; + vu16 *funcDest; void (*readFlash_Core)(vu8 *, u8 *, u32); REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8; @@ -153,8 +153,8 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size) sectorNum %= SECTORS_PER_BANK; } - funcSrc = (u16 *)ReadFlash_Core; - funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1); + funcSrc = (vu16 *)ReadFlash_Core; + funcSrc = (vu16 *)((uintptr_t)funcSrc ^ 1); funcDest = readFlash_Core_Buffer; i = ((uintptr_t)ReadFlash - (uintptr_t)ReadFlash_Core) >> 1; @@ -186,9 +186,9 @@ u32 VerifyFlashSector_Core(u8 *src, u8 *tgt, u32 size) u32 VerifyFlashSector(u16 sectorNum, u8 *src) { u16 i; - u16 verifyFlashSector_Core_Buffer[0x80]; - u16 *funcSrc; - u16 *funcDest; + vu16 verifyFlashSector_Core_Buffer[0x80]; + vu16 *funcSrc; + vu16 *funcDest; u8 *tgt; u16 size; u32 (*verifyFlashSector_Core)(u8 *, u8 *, u32); @@ -201,8 +201,8 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src) sectorNum %= SECTORS_PER_BANK; } - funcSrc = (u16 *)VerifyFlashSector_Core; - funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1); + funcSrc = (vu16 *)VerifyFlashSector_Core; + funcSrc = (vu16 *)((uintptr_t)funcSrc ^ 1); funcDest = verifyFlashSector_Core_Buffer; i = (u16)(((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1); @@ -224,9 +224,9 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src) u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) { u16 i; - u16 verifyFlashSector_Core_Buffer[0x80]; - u16 *funcSrc; - u16 *funcDest; + vu16 verifyFlashSector_Core_Buffer[0x80]; + vu16 *funcSrc; + vu16 *funcDest; u8 *tgt; u32 (*verifyFlashSector_Core)(u8 *, u8 *, u32); @@ -238,8 +238,8 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8; - funcSrc = (u16 *)VerifyFlashSector_Core; - funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1); + funcSrc = (vu16 *)VerifyFlashSector_Core; + funcSrc = (vu16 *)((uintptr_t)funcSrc ^ 1); funcDest = verifyFlashSector_Core_Buffer; i = ((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1; @@ -293,4 +293,4 @@ u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n) } return result; -} \ No newline at end of file +} diff --git a/src/apprentice.c b/src/apprentice.c index b815c3677a..1c8c8d124b 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1297,13 +1297,13 @@ const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language) // Functionally unused static void Task_SwitchToFollowupFuncAfterButtonPress(u8 taskId) { - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) SwitchTaskToFollowupFunc(taskId); } static void Task_ExecuteFuncAfterButtonPress(u8 taskId) { - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { gApprenticeFunc = (void*)(u32)(((u16)gTasks[taskId].data[0] | (gTasks[taskId].data[1] << 16))); gApprenticeFunc(); diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index f4769145d4..c8d43e12e0 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3178,14 +3178,14 @@ static void AnimItemSteal_Step3(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(63)); if (moveAlongLinearPath(sprite)) { sprite->pos2.y = 0; sprite->data[0] = 0; sprite->callback = AnimItemSteal_Step2; - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64)); } } @@ -4260,7 +4260,7 @@ static void AnimLockOnTarget_Step1(struct Sprite* sprite) sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step2); sprite->data[5] += 0x100; - PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_LOCK_ON, BattleAnimAdjustPanning(63)); break; } @@ -4346,7 +4346,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite) sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63)); } else if (sprite->data[1] == 0) { @@ -4821,7 +4821,7 @@ static void AnimSharpenSphere_Step(struct Sprite* sprite) { sprite->data[4]++; if (!(sprite->data[4] & 1)) - PlaySE12WithPanning(SE_W207B, sprite->data[5]); + PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]); } sprite->data[0] = 0; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index f7d1eea107..d891a4d016 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1632,7 +1632,7 @@ static void AirCutterProjectileStep1(u8 taskId) gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId; gTasks[taskId].data[0] = gTasks[taskId].data[3]; gTasks[taskId].data[1]++; - PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-63)); + PlaySE12WithPanning(SE_M_BLIZZARD2, BattleAnimAdjustPanning(-63)); if (gTasks[taskId].data[1] > 2) gTasks[taskId].func = AirCutterProjectileStep2; } @@ -1829,7 +1829,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite) int i; u16 rand; s16* ptr; - PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(63)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -2502,7 +2502,7 @@ static void AnimPencil_Step(struct Sprite *sprite) sprite->pos1.y -= 1; sprite->data[2]++; if (sprite->data[2] % 10 == 0) - PlaySE12WithPanning(SE_W166, sprite->data[6]); + PlaySE12WithPanning(SE_M_SKETCH, sprite->data[6]); } sprite->data[4] += sprite->data[3]; if (sprite->data[4] > 31) diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index afdc900494..58d3351975 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1647,7 +1647,7 @@ static void AnimClappingHand_Step(struct Sprite *sprite) sprite->data[2]++; if (sprite->data[3] == 0) { - PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(-64)); + PlaySE1WithPanning(SE_M_ENCORE, BattleAnimAdjustPanning(-64)); } } } @@ -1931,7 +1931,7 @@ static void TormentAttacker_Step(u8 taskId) y = task->data[3] + task->data[5]; spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]); - PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_METRONOME, BattleAnimAdjustPanning(-64)); if (spriteId != MAX_SPRITES) { @@ -2412,7 +2412,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(-64)); break; case 1: if (gTasks[taskId].data[4]++ > 0) @@ -2447,7 +2447,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) { gTasks[taskId].data[3] = 0; gTasks[taskId].data[0] = 1; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(-64)); } break; case 4: @@ -4769,7 +4769,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64)); gTasks[taskId].data[10] -= 0x800; gTasks[taskId].data[0]++; } @@ -4791,7 +4791,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64)); DestroyAnimVisualTask(taskId); } break; @@ -4828,7 +4828,7 @@ static void AnimBlockX_Step(struct Sprite *sprite) sprite->pos2.y += 10; if (sprite->pos2.y >= 0) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63)); sprite->pos2.y = 0; sprite->data[0]++; } @@ -4838,7 +4838,7 @@ static void AnimBlockX_Step(struct Sprite *sprite) sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 0x7F) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63)); sprite->data[1] = 0; sprite->pos2.y = 0; sprite->data[0]++; @@ -4857,7 +4857,7 @@ static void AnimBlockX_Step(struct Sprite *sprite) case 3: if (++sprite->data[1] > 8) { - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63)); sprite->data[1] = 0; sprite->data[0]++; } @@ -5003,11 +5003,11 @@ void AnimTask_GetReturnPowerLevel(u8 taskId) void AnimTask_SnatchOpposingMonMove(u8 taskId) { u8 spriteId, spriteId2; - int personality; - int otId; + u32 personality; + u32 otId; u16 species; u8 subpriority; - u8 isBackPic; + bool8 isBackPic; s16 x; switch (gTasks[taskId].data[0]) @@ -5035,37 +5035,34 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) otId = gContestResources->moveAnim->otId; species = gContestResources->moveAnim->species; subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker); - isBackPic = 0; + isBackPic = FALSE; x = -32; } + else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + { + personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); + otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); + if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) + species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); + else + species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies; + + subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; + isBackPic = FALSE; + x = 272; + } else { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - { - personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); - otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); - if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); - else - species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies; - - subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; - isBackPic = 0; - x = 272; - } + personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); + otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); + if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); else - { - personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); - otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); - if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); - else - species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies; + species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies; - subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority - 1; - isBackPic = 1; - x = -32; - } + subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority - 1; + isBackPic = TRUE; + x = -32; } spriteId2 = sub_80A8394(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, 0); @@ -5092,7 +5089,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X)) { gTasks[taskId].data[14]++; - gBattleAnimArgs[7] = 0xFFFF; + gBattleAnimArgs[7] = -1; } } else @@ -5100,7 +5097,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X)) { gTasks[taskId].data[14]++; - gBattleAnimArgs[7] = 0xFFFF; + gBattleAnimArgs[7] = -1; } } } @@ -5138,7 +5135,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) gSprites[spriteId].pos2.x = 0; } - gTasks[taskId].data[1] = (u8)gTasks[taskId].data[1]; + gTasks[taskId].data[1] &= 0xFF; if (gSprites[spriteId].pos2.x == 0) DestroyAnimVisualTask(taskId); break; @@ -5152,7 +5149,7 @@ static void sub_815FE80(struct Sprite *sprite) case 0: if (gBattleAnimArgs[7] == -1) { - PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63)); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c index c153dbc105..a57e88b03d 100644 --- a/src/battle_anim_electric.c +++ b/src/battle_anim_electric.c @@ -1242,7 +1242,7 @@ static bool8 sub_810B430(struct Task *task, u8 taskId) if (task->data[4] == 0 && task->data[5] > 0) { task->data[14] += task->data[15]; - PlaySE12WithPanning(SE_W085, task->data[14]); + PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]); } if ((task->data[5] < 0 && task->data[7] <= task->data[8]) diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c index f02ecae194..c8402f727c 100644 --- a/src/battle_anim_fire.c +++ b/src/battle_anim_fire.c @@ -1136,7 +1136,7 @@ static void AnimWillOWispOrb_Step(struct Sprite *sprite) if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) { - PlaySE12WithPanning(SE_W172, gAnimCustomPanning); + PlaySE12WithPanning(SE_M_FLAME_WHEEL, gAnimCustomPanning); } } else diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 3fc4f20f26..fe94dc9a21 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -563,14 +563,23 @@ struct FeatherDanceData u16 unkE_1:15; }; +#define ANIM_SWITCH(sprite) \ + { \ + (sprite)->hFlip ^= 1; \ + (sprite)->animNum = (sprite)->hFlip; \ + (sprite)->animBeginning = TRUE; \ + (sprite)->animEnded = FALSE; \ + } + static void AnimFallingFeather(struct Sprite *sprite) { - u8 battler, matrixNum, sinIndex; + u8 battler, sinIndex; + u32 matrixNum; s16 sinVal; struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; - battler = (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget; + battler = (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget; if (GetBattlerSide(battler) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -583,12 +592,12 @@ static void AnimFallingFeather(struct Sprite *sprite) data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]); data->unk0_0c = 1; data->unk2 = (u16)(gBattleAnimArgs[2] & 0xFF); - data->unkA = (u16)((gBattleAnimArgs[2] >> 8) & 0xFF) ; + data->unkA = (u16)gBattleAnimArgs[2] >> 8; data->unk4 = gBattleAnimArgs[3]; data->unk6 = (u16)gBattleAnimArgs[4]; - *(u16*)(data->unkC) = (u16)gBattleAnimArgs[5]; + *(u16 *)(data->unkC) = (u16)gBattleAnimArgs[5]; - if (data->unk2 >= 64 && data->unk2 <= 191) + if (data->unk2 >= 64 && data->unk2 < 192) { if (!IsContest()) sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; @@ -599,11 +608,7 @@ static void AnimFallingFeather(struct Sprite *sprite) if (!(data->unk4 & 0x8000)) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - - sprite->animBeginning = 1; - sprite->animEnded = 0; + ANIM_SWITCH(sprite); } } else @@ -613,15 +618,11 @@ static void AnimFallingFeather(struct Sprite *sprite) if (data->unk4 & 0x8000) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - - sprite->animBeginning = 1; - sprite->animEnded = 0; + ANIM_SWITCH(sprite); } } - data->unk0_1 = data->unk2/64; + data->unk0_1 = data->unk2 / 64; sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8; matrixNum = sprite->oam.matrixNum; @@ -637,7 +638,8 @@ static void AnimFallingFeather(struct Sprite *sprite) static void sub_810E520(struct Sprite *sprite) { - u8 matrixNum, sinIndex; + u8 sinIndex; + u32 matrixNum; s16 sinVal = 0; struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; if (data->unk0_0a) @@ -667,10 +669,7 @@ static void sub_810E520(struct Sprite *sprite) } else if (data->unk0_0d) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; + ANIM_SWITCH(sprite); if (data->unk0_0c) { if (!IsContest()) @@ -718,10 +717,7 @@ static void sub_810E520(struct Sprite *sprite) } else if (data->unk0_0d) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; + ANIM_SWITCH(sprite); if (data->unk0_0c) { if (!IsContest()) @@ -769,10 +765,7 @@ static void sub_810E520(struct Sprite *sprite) } else if (data->unk0_0d) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; + ANIM_SWITCH(sprite); if (data->unk0_0c) { if (!IsContest()) @@ -819,10 +812,7 @@ static void sub_810E520(struct Sprite *sprite) } else if (data->unk0_0d) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; + ANIM_SWITCH(sprite); if (data->unk0_0c) { if (!IsContest()) diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index b8de6b0e1f..632954351c 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -252,7 +252,7 @@ static void AnimConfuseRayBallBounce_Step1(struct Sprite *sprite) return; if (r0 <= 0) return; - PlaySE12WithPanning(SE_W109, gAnimCustomPanning); + PlaySE12WithPanning(SE_M_CONFUSE_RAY, gAnimCustomPanning); } static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite) @@ -271,7 +271,7 @@ static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite) if (r2 == 0 || r2 > 196) { if (r0 > 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); } if (sprite->data[6] == 0) diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c index 25340f9c6a..3f451998c4 100644 --- a/src/battle_anim_psychic.c +++ b/src/battle_anim_psychic.c @@ -1137,7 +1137,7 @@ static void AnimPsychoBoost(struct Sprite *sprite) case 1: if (sprite->affineAnimEnded) { - PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(-64)); ChangeSpriteAffineAnim(sprite, 1); sprite->data[0]++; } diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index 436ac60a3d..29ba493463 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -631,7 +631,7 @@ static void AnimTask_Rollout_Step(u8 taskId) task->data[0]++; } - PlaySE12WithPanning(SE_W029, task->data[13]); + PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]); break; case 1: if (--task->data[11] == 0) @@ -661,7 +661,7 @@ static void AnimTask_Rollout_Step(u8 taskId) task->data[9] = 0; sub_8111214(task); task->data[13] += task->data[14]; - PlaySE12WithPanning(SE_W091, task->data[13]); + PlaySE12WithPanning(SE_M_DIG, task->data[13]); } if (--task->data[8] == 0) diff --git a/src/battle_anim_special.c b/src/battle_anim_throw.c similarity index 59% rename from src/battle_anim_special.c rename to src/battle_anim_throw.c index bf0d1d438d..fef3013265 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_throw.c @@ -22,51 +22,73 @@ #include "constants/rgb.h" // iwram -int gUnknown_030062DC; -u16 gUnknown_030062E0; -u16 gUnknown_030062E4; +u32 gMonShrinkDuration; +u16 gMonShrinkDelta; +u16 gMonShrinkDistance; + +enum { + BALL_ROLL_1, + BALL_PIVOT_1, + BALL_ROLL_2, + BALL_PIVOT_2, + BALL_ROLL_3, + BALL_NEXT_MOVE, + BALL_WAIT_NEXT_SHAKE +}; + +enum { + MON_SHRINK, + MON_SHRINK_STEP, + MON_SHRINK_INVISIBLE, + MON_SHRINK_FREE +}; + +enum { + SHINY_STAR_ENCIRCLE, + SHINY_STAR_DIAGONAL, +}; static void sub_8170660(u8); -static void sub_8170A38(u8); -static void sub_8170EF0(u8); -static void sub_8171104(struct Sprite *); -static void sub_8171030(u8); -static void sub_81710A8(u8); -static void sub_8171134(struct Sprite *); -static void sub_8171CAC(struct Sprite *); -static void sub_81711E8(struct Sprite *); -static void sub_8171240(struct Sprite *); -static void sub_817138C(struct Sprite *); -static void sub_81713D0(struct Sprite *); -static void sub_81717B4(struct Sprite *); -static void sub_81714D4(struct Sprite *); -static void sub_8171520(struct Sprite *); -static void sub_81717D8(struct Sprite *); -static void sub_8171AE4(struct Sprite *); -static void sub_81717F8(struct Sprite *); -static void sub_81719EC(struct Sprite *); -static void sub_81718D8(struct Sprite *); -static void sub_81719C0(struct Sprite *); -static void sub_8171D60(u8); -static void sub_8171AAC(struct Sprite *); -static void sub_8171BAC(struct Sprite *); -static void sub_8171CE8(struct Sprite *); +static void AnimTask_FlashHealthboxOnLevelUp_Step(u8); +static void AnimTask_ThrowBall_Step(u8); +static void SpriteCB_Ball_Throw(struct Sprite *); +static void AnimTask_ThrowBall_StandingTrainer_Step(u8); +static void Task_PlayerThrow_Wait(u8); +static void SpriteCB_Ball_Arc(struct Sprite *); +static void SpriteCB_Ball_Block(struct Sprite *); +static void SpriteCB_Ball_MonShrink(struct Sprite *); +static void SpriteCB_Ball_MonShrink_Step(struct Sprite *); +static void SpriteCB_Ball_Bounce(struct Sprite *); +static void SpriteCB_Ball_Bounce_Step(struct Sprite *); +static void SpriteCB_Ball_Release(struct Sprite *); +static void SpriteCB_Ball_Wobble(struct Sprite *); +static void SpriteCB_Ball_Wobble_Step(struct Sprite *); +static void SpriteCB_Ball_Capture(struct Sprite *); +static void SpriteCB_Ball_Release_Step(struct Sprite *); +static void SpriteCB_Ball_Capture_Step(struct Sprite *); +static void MakeCaptureStars(struct Sprite *); +static void SpriteCB_Ball_FadeOut(struct Sprite *); +static void DestroySpriteAfterOneFrame(struct Sprite *); +static void LoadBallParticleGfx(u8); +static void SpriteCB_CaptureStar_Flicker(struct Sprite *); +static void SpriteCB_Ball_Release_Wait(struct Sprite *); +static void SpriteCB_Ball_Block_Step(struct Sprite *); static void PokeBallOpenParticleAnimation_Step1(struct Sprite *); static void PokeBallOpenParticleAnimation_Step2(struct Sprite *); static void DestroyBallOpenAnimationParticle(struct Sprite *); static void FanOutBallOpenParticles_Step1(struct Sprite *); static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *); static void PremierBallOpenParticleAnimation_Step1(struct Sprite *); -static void sub_8172AB0(u8); -static void sub_8172B40(u8); -static void sub_8172B90(u8); -static void sub_8172FEC(u8); -static void sub_81731FC(struct Sprite *); -static void sub_8173250(struct Sprite *); -static void sub_81731B0(u8); -static void sub_817339C(struct Sprite *); -static void sub_81733D4(struct Sprite *); -static void sub_8173400(struct Sprite *); +static void Task_FadeMon_ToBallColor(u8); +static void Task_FadeMon_ToNormal(u8); +static void Task_FadeMon_ToNormal_Step(u8); +static void Task_ShinyStars(u8); +static void SpriteCB_ShinyStars_Encircle(struct Sprite *); +static void SpriteCB_ShinyStars_Diagonal(struct Sprite *); +static void Task_ShinyStars_Wait(u8); +static void SpriteCB_PokeBlock_LiftArm(struct Sprite *); +static void SpriteCB_PokeBlock_Arc(struct Sprite *); +static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *); static void PokeBallOpenParticleAnimation(u8); static void GreatBallOpenParticleAnimation(u8); static void SafariBallOpenParticleAnimation(u8); @@ -76,31 +98,31 @@ static void DiveBallOpenParticleAnimation(u8); static void RepeatBallOpenParticleAnimation(u8); static void TimerBallOpenParticleAnimation(u8); static void PremierBallOpenParticleAnimation(u8); -static void sub_817330C(struct Sprite *); +static void SpriteCB_PokeBlock_Throw(struct Sprite *); -struct BallCaptureSuccessStarData +struct CaptureStar { s8 xOffset; s8 yOffset; - s8 unk2; + s8 amplitude; }; -static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] = +static const struct CaptureStar sCaptureStars[] = { { .xOffset = 10, .yOffset = 2, - .unk2 = -3, + .amplitude = -3, }, { .xOffset = 15, .yOffset = 0, - .unk2 = -4, + .amplitude = -4, }, { .xOffset = -10, .yOffset = 2, - .unk2 = -4, + .amplitude = -4, }, }; @@ -117,39 +139,39 @@ static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] = #define TAG_PARTICLES_LUXURYBALL 55030 #define TAG_PARTICLES_PREMIERBALL 55031 -const struct CompressedSpriteSheet gBallParticleSpritesheets[] = +static const struct CompressedSpriteSheet sBallParticleSpriteSheets[POKEBALL_COUNT] = { - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL}, - {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL}, + [BALL_POKE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL}, }; -const struct CompressedSpritePalette gBallParticlePalettes[] = +static const struct CompressedSpritePalette sBallParticlePalettes[POKEBALL_COUNT] = { - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL}, - {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, + [BALL_POKE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, }; -const union AnimCmd gAnim_RegularBall[] = +static const union AnimCmd sAnim_RegularBall[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(1, 1), @@ -160,185 +182,185 @@ const union AnimCmd gAnim_RegularBall[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gAnim_MasterBall[] = +static const union AnimCmd sAnim_MasterBall[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd gAnim_NetDiveBall[] = +static const union AnimCmd sAnim_NetDiveBall[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd gAnim_NestBall[] = +static const union AnimCmd sAnim_NestBall[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END, }; -const union AnimCmd gAnim_LuxuryPremierBall[] = +static const union AnimCmd sAnim_LuxuryPremierBall[] = { ANIMCMD_FRAME(6, 4), ANIMCMD_FRAME(7, 4), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnim_UltraRepeatTimerBall[] = +static const union AnimCmd sAnim_UltraRepeatTimerBall[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_END, }; -const union AnimCmd *const gAnims_BallParticles[] = +static const union AnimCmd *const sAnims_BallParticles[] = { - gAnim_RegularBall, - gAnim_MasterBall, - gAnim_NetDiveBall, - gAnim_NestBall, - gAnim_LuxuryPremierBall, - gAnim_UltraRepeatTimerBall, + sAnim_RegularBall, + sAnim_MasterBall, + sAnim_NetDiveBall, + sAnim_NestBall, + sAnim_LuxuryPremierBall, + sAnim_UltraRepeatTimerBall, }; -const u8 gBallParticleAnimNums[] = +static const u8 sBallParticleAnimNums[POKEBALL_COUNT] = { - [BALL_POKE] = 0, - [BALL_GREAT] = 0, - [BALL_SAFARI] = 0, - [BALL_ULTRA] = 5, - [BALL_MASTER] = 1, - [BALL_NET] = 2, - [BALL_DIVE] = 2, - [BALL_NEST] = 3, - [BALL_REPEAT] = 5, - [BALL_TIMER] = 5, - [BALL_LUXURY] = 4, + [BALL_POKE] = 0, + [BALL_GREAT] = 0, + [BALL_SAFARI] = 0, + [BALL_ULTRA] = 5, + [BALL_MASTER] = 1, + [BALL_NET] = 2, + [BALL_DIVE] = 2, + [BALL_NEST] = 3, + [BALL_REPEAT] = 5, + [BALL_TIMER] = 5, + [BALL_LUXURY] = 4, [BALL_PREMIER] = 4, }; -const TaskFunc gBallParticleAnimationFuncs[] = +static const TaskFunc sBallParticleAnimationFuncs[POKEBALL_COUNT] = { - PokeBallOpenParticleAnimation, - GreatBallOpenParticleAnimation, - SafariBallOpenParticleAnimation, - UltraBallOpenParticleAnimation, - MasterBallOpenParticleAnimation, - SafariBallOpenParticleAnimation, - DiveBallOpenParticleAnimation, - UltraBallOpenParticleAnimation, - RepeatBallOpenParticleAnimation, - TimerBallOpenParticleAnimation, - GreatBallOpenParticleAnimation, - PremierBallOpenParticleAnimation, + [BALL_POKE] = PokeBallOpenParticleAnimation, + [BALL_GREAT] = GreatBallOpenParticleAnimation, + [BALL_SAFARI] = SafariBallOpenParticleAnimation, + [BALL_ULTRA] = UltraBallOpenParticleAnimation, + [BALL_MASTER] = MasterBallOpenParticleAnimation, + [BALL_NET] = SafariBallOpenParticleAnimation, + [BALL_DIVE] = DiveBallOpenParticleAnimation, + [BALL_NEST] = UltraBallOpenParticleAnimation, + [BALL_REPEAT] = RepeatBallOpenParticleAnimation, + [BALL_TIMER] = TimerBallOpenParticleAnimation, + [BALL_LUXURY] = GreatBallOpenParticleAnimation, + [BALL_PREMIER] = PremierBallOpenParticleAnimation, }; -const struct SpriteTemplate gBallParticlesSpriteTemplates[] = +static const struct SpriteTemplate sBallParticleSpriteTemplates[POKEBALL_COUNT] = { - { + [BALL_POKE] = { .tileTag = TAG_PARTICLES_POKEBALL, .paletteTag = TAG_PARTICLES_POKEBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_GREAT] = { .tileTag = TAG_PARTICLES_GREATBALL, .paletteTag = TAG_PARTICLES_GREATBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_SAFARI] = { .tileTag = TAG_PARTICLES_SAFARIBALL, .paletteTag = TAG_PARTICLES_SAFARIBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_ULTRA] = { .tileTag = TAG_PARTICLES_ULTRABALL, .paletteTag = TAG_PARTICLES_ULTRABALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_MASTER] = { .tileTag = TAG_PARTICLES_MASTERBALL, .paletteTag = TAG_PARTICLES_MASTERBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_NET] = { .tileTag = TAG_PARTICLES_NETBALL, .paletteTag = TAG_PARTICLES_NETBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_DIVE] = { .tileTag = TAG_PARTICLES_DIVEBALL, .paletteTag = TAG_PARTICLES_DIVEBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_NEST] = { .tileTag = TAG_PARTICLES_NESTBALL, .paletteTag = TAG_PARTICLES_NESTBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_REPEAT] = { .tileTag = TAG_PARTICLES_REPEATBALL, .paletteTag = TAG_PARTICLES_REPEATBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_TIMER] = { .tileTag = TAG_PARTICLES_TIMERBALL, .paletteTag = TAG_PARTICLES_TIMERBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_LUXURY] = { .tileTag = TAG_PARTICLES_LUXURYBALL, .paletteTag = TAG_PARTICLES_LUXURYBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, - { + [BALL_PREMIER] = { .tileTag = TAG_PARTICLES_PREMIERBALL, .paletteTag = TAG_PARTICLES_PREMIERBALL, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gAnims_BallParticles, + .anims = sAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, @@ -379,28 +401,29 @@ const struct SpriteTemplate gPokeblockSpriteTemplate = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_817330C, + .callback = SpriteCB_PokeBlock_Throw, }; -const union AnimCmd gUnknown_085E5350[] = +static const union AnimCmd sAnim_SafariRock[] = { ANIMCMD_FRAME(64, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085E5358[] = { - gUnknown_085E5350, +static const union AnimCmd *const sAnims_SafariRock[] = { + sAnim_SafariRock, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_085E535C = +// Unused, leftover from FRLG +static const struct SpriteTemplate sSafariRockSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_085E5358, + .anims = sAnims_SafariRock, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_817330C, + .callback = SpriteCB_PokeBlock_Throw, }; extern const struct SpriteTemplate gWishStarSpriteTemplate; @@ -572,13 +595,13 @@ void AnimTask_FlashHealthboxOnLevelUp(u8 taskId) { gTasks[taskId].data[10] = gBattleAnimArgs[0]; gTasks[taskId].data[11] = gBattleAnimArgs[1]; - gTasks[taskId].func = sub_8170A38; + gTasks[taskId].func = AnimTask_FlashHealthboxOnLevelUp_Step; } -static void sub_8170A38(u8 taskId) +static void AnimTask_FlashHealthboxOnLevelUp_Step(u8 taskId) { u8 paletteNum; - int paletteOffset, colorOffset; + u32 paletteOffset, colorOffset; gTasks[taskId].data[0]++; if (gTasks[taskId].data[0]++ >= gTasks[taskId].data[11]) @@ -658,13 +681,13 @@ void AnimTask_SwitchOutBallEffect(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X); + y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y); priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballId); selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0); - gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); + gTasks[taskId].data[11] = LaunchBallFadeMonTask(FALSE, gBattleAnimAttacker, selectedPalettes, ballId); gTasks[taskId].data[0]++; break; case 1: @@ -730,6 +753,12 @@ u8 ItemIdToBallId(u16 ballItem) } } +#define tSpriteId data[0] + +#define sDuration data[0] +#define sTargetX data[1] +#define sTargetY data[2] + void AnimTask_ThrowBall(u8 taskId) { u8 ballId; @@ -737,26 +766,26 @@ void AnimTask_ThrowBall(u8 taskId) ballId = ItemIdToBallId(gLastUsedItem); spriteId = CreateSprite(&gBallSpriteTemplates[ballId], 32, 80, 29); - gSprites[spriteId].data[0] = 34; - gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; - gSprites[spriteId].callback = sub_8171104; - gBattleSpritesDataPtr->animationData->field_9_x2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; - gTasks[taskId].data[0] = spriteId; - gTasks[taskId].func = sub_8170EF0; + gSprites[spriteId].sDuration = 34; + gSprites[spriteId].sTargetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); + gSprites[spriteId].sTargetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) - 16; + gSprites[spriteId].callback = SpriteCB_Ball_Throw; + gBattleSpritesDataPtr->animationData->wildMonInvisible = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; + gTasks[taskId].tSpriteId = spriteId; + gTasks[taskId].func = AnimTask_ThrowBall_Step; } -static void sub_8170EF0(u8 taskId) +static void AnimTask_ThrowBall_Step(u8 taskId) { - u8 spriteId = gTasks[taskId].data[0]; - if ((u16)gSprites[spriteId].data[0] == 0xFFFF) + u8 spriteId = gTasks[taskId].tSpriteId; + if ((u16)gSprites[spriteId].sDuration == 0xFFFF) DestroyAnimVisualTask(taskId); } -// Safari Ball / Wally's ball throw -void AnimTask_ThrowBallSpecial(u8 taskId) +// Safari Zone throw / Wally's throw +void AnimTask_ThrowBall_StandingTrainer(u8 taskId) { - int x, y; + s16 x, y; u8 ballId; u8 subpriority; u8 spriteId; @@ -775,27 +804,33 @@ void AnimTask_ThrowBallSpecial(u8 taskId) ballId = ItemIdToBallId(gLastUsedItem); subpriority = GetBattlerSpriteSubpriority(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1; spriteId = CreateSprite(&gBallSpriteTemplates[ballId], x + 32, y | 80, subpriority); - gSprites[spriteId].data[0] = 34; - gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; + gSprites[spriteId].sDuration = 34; + gSprites[spriteId].sTargetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); + gSprites[spriteId].sTargetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) - 16; gSprites[spriteId].callback = SpriteCallbackDummy; - gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].callback = sub_8039E84; - gTasks[taskId].data[0] = spriteId; - gTasks[taskId].func = sub_8171030; + gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].callback = SpriteCB_TrainerThrowObject; + gTasks[taskId].tSpriteId = spriteId; + gTasks[taskId].func = AnimTask_ThrowBall_StandingTrainer_Step; } -static void sub_8171030(u8 taskId) +static void AnimTask_ThrowBall_StandingTrainer_Step(u8 taskId) { if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1) { - PlaySE12WithPanning(SE_NAGERU, 0); - gSprites[gTasks[taskId].data[0]].callback = sub_8171104; - CreateTask(sub_81710A8, 10); - gTasks[taskId].func = sub_8170EF0; + PlaySE12WithPanning(SE_BALL_THROW, 0); + gSprites[gTasks[taskId].tSpriteId].callback = SpriteCB_Ball_Throw; + CreateTask(Task_PlayerThrow_Wait, 10); + gTasks[taskId].func = AnimTask_ThrowBall_Step; } } -static void sub_81710A8(u8 taskId) +#undef sDuration +#undef sTargetX +#undef sTargetY + +#undef tSpriteId + +static void Task_PlayerThrow_Wait(u8 taskId) { if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animEnded) { @@ -804,29 +839,50 @@ static void sub_81710A8(u8 taskId) } } -static void sub_8171104(struct Sprite *sprite) +#define sTargetXArg data[1] +#define sTargetYArg data[2] + +#define sOffsetX data[1] // re-use +#define sTargetX data[2] // re-use +#define sOffsetY data[3] +#define sTargetY data[4] +#define sAmplitude data[5] + +static void SpriteCB_Ball_Throw(struct Sprite *sprite) { - u16 temp = sprite->data[1]; - u16 temp2 = sprite->data[2]; - sprite->data[1] = sprite->pos1.x; - sprite->data[2] = temp; - sprite->data[3] = sprite->pos1.y; - sprite->data[4] = temp2; - sprite->data[5] = -40; + u16 targetX = sprite->sTargetXArg; + u16 targetY = sprite->sTargetYArg; + + sprite->sOffsetX = sprite->pos1.x; + sprite->sTargetX = targetX; + sprite->sOffsetY = sprite->pos1.y; + sprite->sTargetY = targetY; + sprite->sAmplitude = -40; InitAnimArcTranslation(sprite); - sprite->callback = sub_8171134; + sprite->callback = SpriteCB_Ball_Arc; } -static void sub_8171134(struct Sprite *sprite) +#undef sTargetXArg +#undef sTargetYArg +#undef sOffsetX +#undef sTargetX +#undef sOffsetY +#undef sTargetY +#undef sAmplitude + +#define sTimer data[5] +#define sTaskId data[5] // re-use + +static void SpriteCB_Ball_Arc(struct Sprite *sprite) { - int i; + s32 i; u8 ballId; if (TranslateAnimHorizontalArc(sprite)) { if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK) { - sprite->callback = sub_8171CAC; + sprite->callback = SpriteCB_Ball_Block; } else { @@ -839,374 +895,451 @@ static void sub_8171134(struct Sprite *sprite) for (i = 0; i < 8; i++) sprite->data[i] = 0; - sprite->data[5] = 0; - sprite->callback = sub_81711E8; + sprite->sTimer = 0; + sprite->callback = SpriteCB_Ball_MonShrink; ballId = ItemIdToBallId(gLastUsedItem); switch (ballId) { case 0 ... POKEBALL_COUNT - 1: AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); - LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); + LaunchBallFadeMonTask(FALSE, gBattleAnimTarget, 14, ballId); break; } } } } -static void sub_81711E8(struct Sprite *sprite) +static void SpriteCB_Ball_MonShrink(struct Sprite *sprite) { - if (++sprite->data[5] == 10) + if (++sprite->sTimer == 10) { - sprite->data[5] = CreateTask(TaskDummy, 50); - sprite->callback = sub_8171240; + sprite->sTaskId = CreateTask(TaskDummy, 50); + sprite->callback = SpriteCB_Ball_MonShrink_Step; gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0; } } -static void sub_8171240(struct Sprite *sprite) +#undef sTimer +#undef sTaskId + +#define tState data[0] +#define sTimer data[1] +#define sTaskId data[5] + +static void SpriteCB_Ball_MonShrink_Step(struct Sprite *sprite) { u8 spriteId; u8 taskId; spriteId = gBattlerSpriteIds[gBattleAnimTarget]; - taskId = sprite->data[5]; + taskId = sprite->sTaskId; - if (++gTasks[taskId].data[1] == 11) - PlaySE(SE_SUIKOMU); + if (++gTasks[taskId].sTimer == 11) + PlaySE(SE_BALL_TRADE); - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 0: + case MON_SHRINK: PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL); gTasks[taskId].data[10] = 256; - gUnknown_030062DC = 28; - gUnknown_030062E4 = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); - gUnknown_030062E0 = (u32)(gUnknown_030062E4 * 256) / 28; - gTasks[taskId].data[2] = gUnknown_030062E0; - gTasks[taskId].data[0]++; + gMonShrinkDuration = 28; + gMonShrinkDistance = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); + gMonShrinkDelta = (u32)(gMonShrinkDistance * 256) / gMonShrinkDuration; + gTasks[taskId].data[2] = gMonShrinkDelta; + gTasks[taskId].tState++; // MON_SHRINK_STEP break; - case 1: - gTasks[taskId].data[10] += 0x20; + case MON_SHRINK_STEP: + gTasks[taskId].data[10] += 32; SetSpriteRotScale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); gTasks[taskId].data[3] += gTasks[taskId].data[2]; gSprites[spriteId].pos2.y = -gTasks[taskId].data[3] >> 8; - if (gTasks[taskId].data[10] >= 0x480) - gTasks[taskId].data[0]++; + if (gTasks[taskId].data[10] >= 1152) + gTasks[taskId].tState++; // MON_SHRINK_INVISIBLE break; - case 2: + case MON_SHRINK_INVISIBLE: ResetSpriteRotScale(spriteId); gSprites[spriteId].invisible = TRUE; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; // MON_SHRINK_FREE break; + case MON_SHRINK_FREE: default: if (gTasks[taskId].data[1] > 10) { DestroyTask(taskId); StartSpriteAnim(sprite, 2); sprite->data[5] = 0; - sprite->callback = sub_817138C; + sprite->callback = SpriteCB_Ball_Bounce; } break; } } -static void sub_817138C(struct Sprite *sprite) +#undef sTimer +#undef tState +#undef sTaskId + +#define sState data[3] +#define sAmplitude data[4] +#define sPhase data[5] + +static void SpriteCB_Ball_Bounce(struct Sprite *sprite) { - int angle; + s16 phase; if (sprite->animEnded) { - sprite->data[3] = 0; - sprite->data[4] = 40; - sprite->data[5] = 0; - angle = 0; - sprite->pos1.y += Cos(angle, 40); - sprite->pos2.y = -Cos(angle, sprite->data[4]); - sprite->callback = sub_81713D0; + sprite->sState = 0; + sprite->sAmplitude = 40; + sprite->sPhase = 0; + phase = 0; + sprite->pos1.y += Cos(phase, 40); + sprite->pos2.y = -Cos(phase, sprite->sAmplitude); + sprite->callback = SpriteCB_Ball_Bounce_Step; } } -static void sub_81713D0(struct Sprite *sprite) +#undef sState +#undef sAmplitude +#undef sPhase + +#define DIRECTION(state) (state & 0xFF) +#define PHASE_DELTA(state) (state >> 8) +#define BOUNCES(state) (state >> 8) +#define FALL(state) (state &= -0x100) +#define RISE_FASTER(state) (state += 257) + +#define BALL_FALLING 0 +#define BALL_RISING 1 + +#define sState data[3] +#define sAmplitude data[4] +#define sPhase data[5] +#define sTimer data[5] // re-use + +// Animates the Poké Ball dropping to ground and bouncing. +static void SpriteCB_Ball_Bounce_Step(struct Sprite *sprite) { bool8 lastBounce; - int bounceCount; + s16 bounceCount; - lastBounce = 0; + lastBounce = FALSE; - switch (sprite->data[3] & 0xFF) + switch (DIRECTION(sprite->sState)) { - case 0: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); - sprite->data[5] += (sprite->data[3] >> 8) + 4; - if (sprite->data[5] >= 64) + case BALL_FALLING: + sprite->pos2.y = -Cos(sprite->sPhase, sprite->sAmplitude); + sprite->sPhase += PHASE_DELTA(sprite->sState) + 4; + // Once the ball touches the ground + if (sprite->sPhase >= 64) { - sprite->data[4] -= 10; - sprite->data[3] += 257; + sprite->sAmplitude -= 10; + RISE_FASTER(sprite->sState); - bounceCount = sprite->data[3] >> 8; + bounceCount = BOUNCES(sprite->sState); if (bounceCount == 4) - lastBounce = 1; + lastBounce = TRUE; - // Play a different sound effect for each pokeball bounce. switch (bounceCount) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } break; - case 1: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); - sprite->data[5] -= (sprite->data[3] >> 8) + 4; - if (sprite->data[5] <= 0) + case BALL_RISING: + sprite->pos2.y = -Cos(sprite->sPhase, sprite->sAmplitude); + sprite->sPhase -= PHASE_DELTA(sprite->sState) + 4; + // Once ball reaches max height + if (sprite->sPhase <= 0) { - sprite->data[5] = 0; - sprite->data[3] &= -0x100; + // Set to BALL_FALLING + sprite->sPhase = 0; + FALL(sprite->sState); } break; } if (lastBounce) { - sprite->data[3] = 0; + sprite->sState = 0; sprite->pos1.y += Cos(64, 40); sprite->pos2.y = 0; if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_NO_SHAKES) { - sprite->data[5] = 0; - sprite->callback = sub_81717B4; + sprite->sTimer = 0; + sprite->callback = SpriteCB_Ball_Release; } else { - sprite->callback = sub_81714D4; + sprite->callback = SpriteCB_Ball_Wobble; sprite->data[4] = 1; sprite->data[5] = 0; } } } -static void sub_81714D4(struct Sprite *sprite) +#undef sState +#undef sAmplitude +#undef sPhase +#undef sTimer + +#undef DIRECTION +#undef PHASE_DELTA +#undef BOUNCES +#undef FALL +#undef RISE_FASTER + +#define sTimer data[3] +#define sState data[3] // re-use + +static void SpriteCB_Ball_Wobble(struct Sprite *sprite) { - if (++sprite->data[3] == 31) + if (++sprite->sTimer == 31) { - sprite->data[3] = 0; - sprite->affineAnimPaused = 1; - StartSpriteAffineAnim(sprite, 1); - gBattleSpritesDataPtr->animationData->field_C = 0; - sprite->callback = sub_8171520; - PlaySE(SE_BOWA); + sprite->sState = 0; + sprite->affineAnimPaused = TRUE; + StartSpriteAffineAnim(sprite, BALL_ROTATE_RIGHT); + gBattleSpritesDataPtr->animationData->ballSubpx = 0; + sprite->callback = SpriteCB_Ball_Wobble_Step; + PlaySE(SE_BALL); } } -static void sub_8171520(struct Sprite *sprite) +#undef sTimer +#undef sState + +#define sState data[3] +#define sDirection data[4] +#define sTimer data[5] + +#define STATE(state) (state & 0xFF) +#define SHAKES(state) (state >> 8) +#define SHAKE_INC(state) (state += 0x100) +#define RESET_STATE(state) (state &= -0x100) + +static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite) { - s8 state; - u16 var0; + s8 shakes; + u16 frame; - switch (sprite->data[3] & 0xFF) + switch (STATE(sprite->sState)) { - case 0: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + case BALL_ROLL_1: + // Rolling effect: every frame in the rotation, the sprite shifts 176/256 of a pixel. + if (gBattleSpritesDataPtr->animationData->ballSubpx > 255) { - sprite->pos2.x += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + sprite->pos2.x += sprite->sDirection; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else - { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; - } + gBattleSpritesDataPtr->animationData->ballSubpx += 176; - sprite->data[5]++; - sprite->affineAnimPaused = 0; - var0 = sprite->data[5] + 7; - if (var0 > 14) + sprite->sTimer++; + sprite->affineAnimPaused = FALSE; + frame = sprite->sTimer + 7; + if (frame > 14) { - gBattleSpritesDataPtr->animationData->field_C = 0; - sprite->data[3]++; - sprite->data[5] = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; + sprite->sState++; // BALL_PIVOT_1 + sprite->sTimer = 0; } break; - case 1: - if (++sprite->data[5] == 1) + case BALL_PIVOT_1: + if (++sprite->sTimer == 1) { - sprite->data[5] = 0; - sprite->data[4] = -sprite->data[4]; - sprite->data[3]++; - sprite->affineAnimPaused = 0; - if (sprite->data[4] < 0) - ChangeSpriteAffineAnim(sprite, 2); + sprite->sTimer = 0; + sprite->sDirection = -sprite->sDirection; + sprite->sState++; // BALL_ROLL_2 + sprite->affineAnimPaused = FALSE; + if (sprite->sDirection < 0) + ChangeSpriteAffineAnim(sprite, BALL_ROTATE_LEFT); else - ChangeSpriteAffineAnim(sprite, 1); + ChangeSpriteAffineAnim(sprite, BALL_ROTATE_RIGHT); } else - { - sprite->affineAnimPaused = 1; - } + sprite->affineAnimPaused = TRUE; break; - case 2: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + case BALL_ROLL_2: + if (gBattleSpritesDataPtr->animationData->ballSubpx > 255) { - sprite->pos2.x += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + sprite->pos2.x += sprite->sDirection; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else - { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; - } + gBattleSpritesDataPtr->animationData->ballSubpx += 176; - sprite->data[5]++; - sprite->affineAnimPaused = 0; - var0 = sprite->data[5] + 12; - if (var0 > 24) + sprite->sTimer++; + sprite->affineAnimPaused = FALSE; + frame = sprite->sTimer + 12; + if (frame > 24) { - gBattleSpritesDataPtr->animationData->field_C = 0; - sprite->data[3]++; - sprite->data[5] = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; + sprite->sState++; // BALL_PIVOT_2 + sprite->sTimer = 0; } break; - case 3: - if (sprite->data[5]++ < 0) + case BALL_PIVOT_2: + if (sprite->sTimer++ < 0) { - sprite->affineAnimPaused = 1; + sprite->affineAnimPaused = TRUE; break; } - sprite->data[5] = 0; - sprite->data[4] = -sprite->data[4]; - sprite->data[3]++; - sprite->affineAnimPaused = 0; - if (sprite->data[4] < 0) - ChangeSpriteAffineAnim(sprite, 2); + sprite->sTimer = 0; + sprite->sDirection = -sprite->sDirection; + sprite->sState++; // BALL_ROLL_3 + sprite->affineAnimPaused = FALSE; + if (sprite->sDirection < 0) + ChangeSpriteAffineAnim(sprite, BALL_ROTATE_LEFT); else - ChangeSpriteAffineAnim(sprite, 1); + ChangeSpriteAffineAnim(sprite, BALL_ROTATE_RIGHT); // fall through - case 4: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + case BALL_ROLL_3: + if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF) { - sprite->pos2.x += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + sprite->pos2.x += sprite->sDirection; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else - { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; - } + gBattleSpritesDataPtr->animationData->ballSubpx += 176; - sprite->data[5]++; - sprite->affineAnimPaused = 0; - var0 = sprite->data[5] + 4; - if (var0 > 8) + sprite->sTimer++; + sprite->affineAnimPaused = FALSE; + frame = sprite->sTimer + 4; + if (frame > 8) { - gBattleSpritesDataPtr->animationData->field_C = 0; - sprite->data[3]++; - sprite->data[5] = 0; - sprite->data[4] = -sprite->data[4]; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; + sprite->sState++; // BALL_NEXT_MOVE + sprite->sTimer = 0; + sprite->sDirection = -sprite->sDirection; } break; - case 5: - sprite->data[3] += 0x100; - state = sprite->data[3] >> 8; - if (state == gBattleSpritesDataPtr->animationData->ballThrowCaseId) + case BALL_NEXT_MOVE: + SHAKE_INC(sprite->sState); + shakes = SHAKES(sprite->sState); + if (shakes == gBattleSpritesDataPtr->animationData->ballThrowCaseId) { - sprite->affineAnimPaused = 1; - sprite->callback = sub_81717B4; + sprite->affineAnimPaused = TRUE; + sprite->callback = SpriteCB_Ball_Release; } else { - if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_3_SHAKES_SUCCESS && state == 3) + if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_3_SHAKES_SUCCESS && shakes == 3) { - sprite->callback = sub_81717D8; - sprite->affineAnimPaused = 1; + sprite->callback = SpriteCB_Ball_Capture; + sprite->affineAnimPaused = TRUE; } else { - sprite->data[3]++; - sprite->affineAnimPaused = 1; + sprite->sState++; // BALL_WAIT_NEXT_SHAKE + sprite->affineAnimPaused = TRUE; } } break; - case 6: + case BALL_WAIT_NEXT_SHAKE: default: - if (++sprite->data[5] == 31) + if (++sprite->sTimer == 31) { - sprite->data[5] = 0; - sprite->data[3] &= -0x100; + sprite->sTimer = 0; + RESET_STATE(sprite->sState); StartSpriteAffineAnim(sprite, 3); - if (sprite->data[4] < 0) - StartSpriteAffineAnim(sprite, 2); + if (sprite->sDirection < 0) + StartSpriteAffineAnim(sprite, BALL_ROTATE_LEFT); else - StartSpriteAffineAnim(sprite, 1); + StartSpriteAffineAnim(sprite, BALL_ROTATE_RIGHT); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } } -static void sub_81717B4(struct Sprite *sprite) +#undef STATE +#undef SHAKES +#undef SHAKE_INC +#undef RESET_STATE + +#undef sState + +#define sTimer data[5] + +static void SpriteCB_Ball_Release(struct Sprite *sprite) { - if (++sprite->data[5] == 31) + if (++sprite->sTimer == 31) { sprite->data[5] = 0; - sprite->callback = sub_8171AE4; + sprite->callback = SpriteCB_Ball_Release_Step; } } +#undef sTimer -static void sub_81717D8(struct Sprite *sprite) +#define sState data[0] +#define sTimer data[4] + +static void SpriteCB_Ball_Capture(struct Sprite *sprite) { - sprite->animPaused = 1; - sprite->callback = sub_81717F8; + sprite->animPaused = TRUE; + sprite->callback = SpriteCB_Ball_Capture_Step; sprite->data[3] = 0; - sprite->data[4] = 0; + sprite->sTimer = 0; sprite->data[5] = 0; } -static void sub_81717F8(struct Sprite *sprite) +// Fade and unfade ball, create star animations, play sound effects +static void SpriteCB_Ball_Capture_Step(struct Sprite *sprite) { u8 *battler = &gBattleAnimTarget; - sprite->data[4]++; - if (sprite->data[4] == 40) + sprite->sTimer++; + if (sprite->sTimer == 40) { - PlaySE(SE_RG_GETTING); + PlaySE(SE_RG_BALL_CLICK); BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0)); - sub_81719EC(sprite); + MakeCaptureStars(sprite); } - else if (sprite->data[4] == 60) + else if (sprite->sTimer == 60) { BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0)); } - else if (sprite->data[4] == 95) + else if (sprite->sTimer == 95) { - gDoingBattleAnim = 0; + gDoingBattleAnim = FALSE; UpdateOamPriorityInAllHealthboxes(1); m4aMPlayAllStop(); - PlaySE(MUS_RG_FAN6); + PlaySE(MUS_RG_CAUGHT_INTRO); } - else if (sprite->data[4] == 315) + else if (sprite->sTimer == 315) { FreeOamMatrix(gSprites[gBattlerSpriteIds[*battler]].oam.matrixNum); DestroySprite(&gSprites[gBattlerSpriteIds[*battler]]); - sprite->data[0] = 0; - sprite->callback = sub_81718D8; + + sprite->sState = 0; + sprite->callback = SpriteCB_Ball_FadeOut; } } -static void sub_81718D8(struct Sprite *sprite) +#undef sTimer +#undef sState + +#define sState data[0] +#define sFrame data[0] // re-use + +static void SpriteCB_Ball_FadeOut(struct Sprite *sprite) { u8 paletteIndex; - switch (sprite->data[0]) + switch (sprite->sState) { case 0: sprite->data[1] = 0; @@ -1216,7 +1349,7 @@ static void sub_81718D8(struct Sprite *sprite) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); paletteIndex = IndexOfSpritePaletteTag(sprite->template->paletteTag); BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB(31, 31, 31)); - sprite->data[0]++; + sprite->sState++; break; case 1: if (sprite->data[1]++ > 0) @@ -1225,103 +1358,124 @@ static void sub_81718D8(struct Sprite *sprite) sprite->data[2]++; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[2], sprite->data[2])); if (sprite->data[2] == 16) - sprite->data[0]++; + sprite->sState++; } break; case 2: sprite->invisible = TRUE; - sprite->data[0]++; + sprite->sState++; break; default: if (!gPaletteFade.active) { SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); - sprite->data[0] = 0; - sprite->callback = sub_81719C0; + + sprite->sFrame = 0; + sprite->callback = DestroySpriteAfterOneFrame; } break; } } -static void sub_81719C0(struct Sprite *sprite) +#undef sState +#undef sFrame + +#define sFrame data[0] + +static void DestroySpriteAfterOneFrame(struct Sprite *sprite) { - if (sprite->data[0] == 0) - { - sprite->data[0] = -1; - } + if (sprite->sFrame == 0) + sprite->sFrame = -1; else { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } } +#undef sFrame -static void sub_81719EC(struct Sprite *sprite) +#define sDuration data[0] +#define sTargetX data[2] +#define sTargetY data[4] +#define sAmplitude data[5] + +static void MakeCaptureStars(struct Sprite *sprite) { u32 i; u8 subpriority; if (sprite->subpriority) - { subpriority = sprite->subpriority - 1; - } else { subpriority = 0; sprite->subpriority = 1; } - sub_8171D60(4); - for (i = 0; i < 3; i++) + LoadBallParticleGfx(BALL_MASTER); + for (i = 0; i < ARRAY_COUNT(sCaptureStars); i++) { - u8 spriteId = CreateSprite(&gBallParticlesSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority); + u8 spriteId = CreateSprite(&sBallParticleSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority); if (spriteId != MAX_SPRITES) { - gSprites[spriteId].data[0] = 24; - gSprites[spriteId].data[2] = sprite->pos1.x + sBallCaptureSuccessStarData[i].xOffset; - gSprites[spriteId].data[4] = sprite->pos1.y + sBallCaptureSuccessStarData[i].yOffset; - gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2; + gSprites[spriteId].sDuration = 24; + gSprites[spriteId].sTargetX = sprite->pos1.x + sCaptureStars[i].xOffset; + gSprites[spriteId].sTargetY = sprite->pos1.y + sCaptureStars[i].yOffset; + gSprites[spriteId].sAmplitude = sCaptureStars[i].amplitude; InitAnimArcTranslation(&gSprites[spriteId]); - gSprites[spriteId].callback = sub_8171AAC; - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[4]); + gSprites[spriteId].callback = SpriteCB_CaptureStar_Flicker; + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[BALL_MASTER]); } } } -static void sub_8171AAC(struct Sprite *sprite) +#undef sDuration +#undef sTargetX +#undef sTargetY +#undef sAmplitude + +static void SpriteCB_CaptureStar_Flicker(struct Sprite *sprite) { sprite->invisible = !sprite->invisible; if (TranslateAnimHorizontalArc(sprite)) DestroySprite(sprite); } -static void sub_8171AE4(struct Sprite *sprite) +#define sFrame data[0] +#define sOffsetY data[1] + +// Poké Ball didn't catch - starts: +// - Ball particle animations +// - Wild mon fade to normal color +// - Wild mon emerge from Poké Ball +static void SpriteCB_Ball_Release_Step(struct Sprite *sprite) { u8 ballId; StartSpriteAnim(sprite, 1); StartSpriteAffineAnim(sprite, 0); - sprite->callback = sub_8171BAC; + sprite->callback = SpriteCB_Ball_Release_Wait; ballId = ItemIdToBallId(gLastUsedItem); switch (ballId) { case 0 ... POKEBALL_COUNT - 1: AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); - LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); + LaunchBallFadeMonTask(TRUE, gBattleAnimTarget, 14, ballId); break; } + // Animate Pokémon emerging from Poké Ball gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0x1000; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY = 4096; } -static void sub_8171BAC(struct Sprite *sprite) +static void SpriteCB_Ball_Release_Wait(struct Sprite *sprite) { - int next = FALSE; + bool8 released = FALSE; if (sprite->animEnded) sprite->invisible = TRUE; @@ -1329,28 +1483,31 @@ static void sub_8171BAC(struct Sprite *sprite) if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded) { StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0); - next = TRUE; + released = TRUE; } else { - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288; - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY -= 288; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY >> 8; } - if (sprite->animEnded && next) + if (sprite->animEnded && released) { gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = 0; - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->field_9_x2; - sprite->data[0] = 0; - sprite->callback = sub_81719C0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->wildMonInvisible; + sprite->sFrame = 0; + sprite->callback = DestroySpriteAfterOneFrame; gDoingBattleAnim = 0; UpdateOamPriorityInAllHealthboxes(1); } } -static void sub_8171CAC(struct Sprite *sprite) +#undef sFrame +#undef sOffsetY + +static void SpriteCB_Ball_Block(struct Sprite *sprite) { - int i; + s32 i; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -1359,36 +1516,47 @@ static void sub_8171CAC(struct Sprite *sprite) for (i = 0; i < 6; i++) sprite->data[i] = 0; - sprite->callback = sub_8171CE8; + sprite->callback = SpriteCB_Ball_Block_Step; } -static void sub_8171CE8(struct Sprite *sprite) +#define sDy data[0] +#define sDx data[1] + +#define sFrame data[0] // re-use + +// Poké Ball moves down off screen after being blocked. The x-speed oscillates. +static void SpriteCB_Ball_Block_Step(struct Sprite *sprite) { - s16 var0 = sprite->data[0] + 0x800; - s16 var1 = sprite->data[1] + 0x680; - sprite->pos2.x -= var1 >> 8; - sprite->pos2.y += var0 >> 8; - sprite->data[0] = (sprite->data[0] + 0x800) & 0xFF; - sprite->data[1] = (sprite->data[1] + 0x680) & 0xFF; + s16 dy = sprite->sDy + 0x800; + s16 dx = sprite->sDx + 0x680; + sprite->pos2.x -= dx >> 8; + sprite->pos2.y += dy >> 8; + sprite->sDy = (sprite->sDy + 0x800) & 0xFF; + sprite->sDx = (sprite->sDx + 0x680) & 0xFF; if (sprite->pos1.y + sprite->pos2.y > 160 || sprite->pos1.x + sprite->pos2.x < -8) { - sprite->data[0] = 0; - sprite->callback = sub_81719C0; + sprite->sFrame = 0; + sprite->callback = DestroySpriteAfterOneFrame; gDoingBattleAnim = 0; UpdateOamPriorityInAllHealthboxes(1); } } -static void sub_8171D60(u8 ballId) +#undef sDy +#undef sDx + +#undef sFrame + +static void LoadBallParticleGfx(u8 ballId) { u8 taskId; - if (GetSpriteTileStartByTag(gBallParticleSpritesheets[ballId].tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sBallParticleSpriteSheets[ballId].tag) == 0xFFFF) { - LoadCompressedSpriteSheetUsingHeap(&gBallParticleSpritesheets[ballId]); - LoadCompressedSpritePaletteUsingHeap(&gBallParticlePalettes[ballId]); + LoadCompressedSpriteSheetUsingHeap(&sBallParticleSpriteSheets[ballId]); + LoadCompressedSpritePaletteUsingHeap(&sBallParticlePalettes[ballId]); } } @@ -1396,22 +1564,22 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) { u8 taskId; - sub_8171D60(ballId); - taskId = CreateTask(gBallParticleAnimationFuncs[ballId], 5); + LoadBallParticleGfx(ballId); + taskId = CreateTask(sBallParticleAnimationFuncs[ballId], 5); gTasks[taskId].data[1] = x; gTasks[taskId].data[2] = y; gTasks[taskId].data[3] = priority; gTasks[taskId].data[4] = subpriority; gTasks[taskId].data[15] = ballId; - PlaySE(SE_BOWA2); + PlaySE(SE_BALL_OPEN); return taskId; } -void sub_8171E20(void) +static void IncrBallParticleCount(void) { if (gMain.inBattle) - gBattleSpritesDataPtr->animationData->field_A++; + gBattleSpritesDataPtr->animationData->numBallParticles++; } static void PokeBallOpenParticleAnimation(u8 taskId) @@ -1430,11 +1598,11 @@ static void PokeBallOpenParticleAnimation(u8 taskId) priority = gTasks[taskId].data[3]; subpriority = gTasks[taskId].data[4]; - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; @@ -1489,11 +1657,11 @@ static void TimerBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1523,11 +1691,11 @@ static void DiveBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1558,11 +1726,11 @@ static void SafariBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1593,11 +1761,11 @@ static void UltraBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 10; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 25; @@ -1634,11 +1802,11 @@ static void GreatBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1684,11 +1852,11 @@ static void RepeatBallOpenParticleAnimation(u8 taskId) for (i = 0; i < POKEBALL_COUNT; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 21; @@ -1728,11 +1896,11 @@ static void MasterBallOpenParticleAnimation(u8 taskId) { for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1772,11 +1940,11 @@ static void PremierBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); + spriteId = CreateSprite(&sBallParticleSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { - sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); + IncrBallParticleCount(); + StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]); gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1802,7 +1970,7 @@ static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) { - int i, j; + s32 i, j; if (!gMain.inBattle) { @@ -1813,12 +1981,12 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) } else { - gBattleSpritesDataPtr->animationData->field_A--; - if (gBattleSpritesDataPtr->animationData->field_A == 0) + gBattleSpritesDataPtr->animationData->numBallParticles--; + if (gBattleSpritesDataPtr->animationData->numBallParticles == 0) { for (i = 0; i < POKEBALL_COUNT; i++) { - if (FuncIsActiveTask(gBallParticleAnimationFuncs[i]) == TRUE) + if (FuncIsActiveTask(sBallParticleAnimationFuncs[i]) == TRUE) break; } @@ -1826,8 +1994,8 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) { for (j = 0; j < POKEBALL_COUNT; j++) { - FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag); - FreeSpritePaletteByTag(gBallParticlePalettes[j].tag); + FreeSpriteTilesByTag(sBallParticleSpriteSheets[j].tag); + FreeSpritePaletteByTag(sBallParticlePalettes[j].tag); } } @@ -1840,70 +2008,78 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) } } -u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ballId) +#define tCoeff data[0] +#define tdCoeff data[1] +#define tTimer data[2] +#define tPalOffset data[3] +#define tPaletteLo data[10] +#define tPaletteHi data[11] +#define tBallId data[15] + +u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ballId) { u8 taskId; - taskId = CreateTask(sub_8172AB0, 5); - gTasks[taskId].data[15] = ballId; - gTasks[taskId].data[3] = battler; - gTasks[taskId].data[10] = selectedPalettes; - gTasks[taskId].data[11] = selectedPalettes >> 16; + taskId = CreateTask(Task_FadeMon_ToBallColor, 5); + gTasks[taskId].tBallId = ballId; + gTasks[taskId].tPalOffset = battler; + gTasks[taskId].tPaletteLo = selectedPalettes; + gTasks[taskId].tPaletteHi = selectedPalettes >> 16; if (!unfadeLater) { BlendPalette(battler * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]); - gTasks[taskId].data[1] = 1; + gTasks[taskId].tdCoeff = 1; } else { BlendPalette(battler * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]); - gTasks[taskId].data[0] = 16; - gTasks[taskId].data[1] = -1; - gTasks[taskId].func = sub_8172B40; + gTasks[taskId].tCoeff = 16; + gTasks[taskId].tdCoeff = -1; + gTasks[taskId].func = Task_FadeMon_ToNormal; } BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB(31, 31, 31)); return taskId; } -static void sub_8172AB0(u8 taskId) +static void Task_FadeMon_ToBallColor(u8 taskId) { - u8 ballId = gTasks[taskId].data[15]; + u8 ballId = gTasks[taskId].tBallId; - if (gTasks[taskId].data[2] <= 16) + if (gTasks[taskId].tTimer <= 16) { - BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]); - gTasks[taskId].data[0] += gTasks[taskId].data[1]; - gTasks[taskId].data[2]++; + BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); + gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff; + gTasks[taskId].tTimer++; } else if (!gPaletteFade.active) { - u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); - BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); + u32 selectedPalettes = (u16)gTasks[taskId].tPaletteLo | ((u16)gTasks[taskId].tPaletteHi << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB_WHITE); DestroyTask(taskId); } } -static void sub_8172B40(u8 taskId) +static void Task_FadeMon_ToNormal(u8 taskId) { if (!gPaletteFade.active) { - u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); - BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); - gTasks[taskId].func = sub_8172B90; + u32 selectedPalettes = (u16)gTasks[taskId].tPaletteLo | ((u16)gTasks[taskId].tPaletteHi << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB_WHITE); + gTasks[taskId].func = Task_FadeMon_ToNormal_Step; } } -static void sub_8172B90(u8 taskId) +static void Task_FadeMon_ToNormal_Step(u8 taskId) { - u8 ballId = gTasks[taskId].data[15]; + u8 ballId = gTasks[taskId].tBallId; - if (gTasks[taskId].data[2] <= 16) + if (gTasks[taskId].tTimer <= 16) { - BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]); - gTasks[taskId].data[0] += gTasks[taskId].data[1]; - gTasks[taskId].data[2]++; + BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]); + gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff; + gTasks[taskId].tTimer++; } else { @@ -1911,6 +2087,14 @@ static void sub_8172B90(u8 taskId) } } +#undef tCoeff +#undef tdCoeff +#undef tTimer +#undef tPalOffset +#undef tPaletteLo +#undef tPaletteHi +#undef tBallId + // arg0: TRUE to swap to mon, FALSE to swap to substitute void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId) { @@ -2016,15 +2200,26 @@ void AnimTask_SetTargetToEffectBattler(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_8172EF0(u8 battler, struct Pokemon *mon) +#define tBattler data[0] +#define tStarMove data[1] +#define tStarTimer data[10] +#define tStarIdx data[11] +#define tNumStars data[12] +#define tTimer data[13] + +#define sTaskId data[0] +#define sPhase data[1] // For encircling stars +#define sTimer data[1] // For diagnoal stars + +void TryShinyAnimation(u8 battler, struct Pokemon *mon) { - int isShiny; + bool8 isShiny; u32 otId, personality; u32 shinyValue; - u8 taskId1, taskId2; + u8 taskCirc, taskDgnl; - isShiny = 0; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x80 = 1; + isShiny = FALSE; + gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim = TRUE; otId = GetMonData(mon, MON_DATA_OT_ID); personality = GetMonData(mon, MON_DATA_PERSONALITY); @@ -2042,125 +2237,126 @@ void sub_8172EF0(u8 battler, struct Pokemon *mon) LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_GOLD_STARS - ANIM_SPRITES_START]); } - taskId1 = CreateTask(sub_8172FEC, 10); - taskId2 = CreateTask(sub_8172FEC, 10); - gTasks[taskId1].data[0] = battler; - gTasks[taskId2].data[0] = battler; - gTasks[taskId1].data[1] = 0; - gTasks[taskId2].data[1] = 1; + taskCirc = CreateTask(Task_ShinyStars, 10); + taskDgnl = CreateTask(Task_ShinyStars, 10); + gTasks[taskCirc].tBattler = battler; + gTasks[taskDgnl].tBattler = battler; + gTasks[taskCirc].tStarMove = SHINY_STAR_ENCIRCLE; + gTasks[taskDgnl].tStarMove = SHINY_STAR_DIAGONAL; return; } } - gBattleSpritesDataPtr->healthBoxesData[battler].field_1_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim = TRUE; } -static void sub_8172FEC(u8 taskId) +static void Task_ShinyStars(u8 taskId) { u8 battler; u8 x, y; u8 spriteId; - u16 counter; - s16 state; + u16 timer; + s16 starIdx; u8 pan; - if (gTasks[taskId].data[13] < 60) + if (gTasks[taskId].tTimer < 60) { - gTasks[taskId].data[13]++; + gTasks[taskId].tTimer++; return; } - if (gBattleSpritesDataPtr->animationData->field_A) + // Wait until the ball particles have despawned + if (gBattleSpritesDataPtr->animationData->numBallParticles) return; - counter = gTasks[taskId].data[10]++; - if (counter & 3) + timer = gTasks[taskId].tStarTimer++; + if (timer % 4) // Create sprite 1 of every 4 frames return; - battler = gTasks[taskId].data[0]; - x = GetBattlerSpriteCoord(battler, 0); - y = GetBattlerSpriteCoord(battler, 1); - state = gTasks[taskId].data[11]; - if (state == 0) + battler = gTasks[taskId].tBattler; + x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X); + y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y); + + starIdx = gTasks[taskId].tStarIdx; + if (starIdx == 0) // Big star { spriteId = CreateSprite(&gWishStarSpriteTemplate, x, y, 5); } - else if (state >= 0 && gTasks[taskId].data[11] < 4) + else if (starIdx >= 0 && gTasks[taskId].tStarIdx < 4) // Medium star { spriteId = CreateSprite(&gMiniTwinklingStarSpriteTemplate, x, y, 5); gSprites[spriteId].oam.tileNum += 4; } - else + else // Small star { spriteId = CreateSprite(&gMiniTwinklingStarSpriteTemplate, x, y, 5); gSprites[spriteId].oam.tileNum += 5; } - if (gTasks[taskId].data[1] == 0) + if (gTasks[taskId].tStarMove == SHINY_STAR_ENCIRCLE) { - gSprites[spriteId].callback = sub_81731FC; + gSprites[spriteId].callback = SpriteCB_ShinyStars_Encircle; } else { - gSprites[spriteId].callback = sub_8173250; + gSprites[spriteId].callback = SpriteCB_ShinyStars_Diagonal; gSprites[spriteId].pos2.x = -32; gSprites[spriteId].pos2.y = 32; gSprites[spriteId].invisible = TRUE; - if (gTasks[taskId].data[11] == 0) + if (gTasks[taskId].tStarIdx == 0) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) pan = -64; else pan = 63; - PlaySE12WithPanning(SE_REAPOKE, pan); + PlaySE12WithPanning(SE_SHINY, pan); } } - gSprites[spriteId].data[0] = taskId; - gTasks[taskId].data[11]++; + gSprites[spriteId].sTaskId = taskId; + gTasks[taskId].tStarIdx++; if (spriteId != MAX_SPRITES) - gTasks[taskId].data[12]++; + gTasks[taskId].tNumStars++; - if (gTasks[taskId].data[11] == 5) - gTasks[taskId].func = sub_81731B0; + if (gTasks[taskId].tStarIdx == 5) + gTasks[taskId].func = Task_ShinyStars_Wait; } -static void sub_81731B0(u8 taskId) +static void Task_ShinyStars_Wait(u8 taskId) { u8 battler; - if (gTasks[taskId].data[12] == 0) + if (gTasks[taskId].tNumStars == 0) { - if (gTasks[taskId].data[1] == 1) + if (gTasks[taskId].tStarMove == SHINY_STAR_DIAGONAL) { - battler = gTasks[taskId].data[0]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_1_x1 = 1; + battler = gTasks[taskId].tBattler; + gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim = TRUE; } DestroyTask(taskId); } } -static void sub_81731FC(struct Sprite *sprite) +static void SpriteCB_ShinyStars_Encircle(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[1], 24); - sprite->pos2.y = Cos(sprite->data[1], 24); - sprite->data[1] += 12; - if (sprite->data[1] > 0xFF) + sprite->pos2.x = Sin(sprite->sPhase, 24); + sprite->pos2.y = Cos(sprite->sPhase, 24); + sprite->sPhase += 12; + if (sprite->sPhase > 255) { - gTasks[sprite->data[0]].data[12]--; + gTasks[sprite->sTaskId].tNumStars--; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } } -static void sub_8173250(struct Sprite *sprite) +static void SpriteCB_ShinyStars_Diagonal(struct Sprite *sprite) { - if (sprite->data[1] < 4) - { - sprite->data[1]++; - } + // Delayed four frames to de-sync from encircling stars + if (sprite->sTimer < 4) + sprite->sTimer++; else { sprite->invisible = FALSE; @@ -2168,13 +2364,24 @@ static void sub_8173250(struct Sprite *sprite) sprite->pos2.y -= 5; if (sprite->pos2.x > 32) { - gTasks[sprite->data[0]].data[12]--; + gTasks[sprite->sTaskId].tNumStars--; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } } } +#undef tBattler +#undef tStarMove +#undef tStarTimer +#undef tStarIdx +#undef tNumStars +#undef tTimer + +#undef sTaskId +#undef sPhase +#undef sTimer + void AnimTask_LoadPokeblockGfx(u8 taskId) { u8 paletteIndex; @@ -2192,35 +2399,46 @@ void AnimTask_FreePokeblockGfx(u8 taskId) DestroyAnimVisualTask(taskId); } -static void sub_817330C(struct Sprite *sprite) +#define sDuration data[0] +#define sTargetX data[2] +#define sTargetY data[4] +#define sAmplitude data[5] + +static void SpriteCB_PokeBlock_Throw(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, 0); - sprite->data[0] = 30; - sprite->data[2] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3]; - sprite->data[5] = -32; + sprite->sDuration = 30; + sprite->sTargetX = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), BATTLER_COORD_X) + gBattleAnimArgs[2]; + sprite->sTargetY = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), BATTLER_COORD_Y) + gBattleAnimArgs[3]; + sprite->sAmplitude = -32; InitAnimArcTranslation(sprite); - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].callback = sub_8039E84; - sprite->callback = sub_817339C; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].callback = SpriteCB_TrainerThrowObject; + sprite->callback = SpriteCB_PokeBlock_LiftArm; } -static void sub_817339C(struct Sprite *sprite) +#undef sDuration +#undef sTargetX +#undef sTargetY +#undef sAmplitude + +static void SpriteCB_PokeBlock_LiftArm(struct Sprite *sprite) { if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animCmdIndex == 1) - sprite->callback = sub_81733D4; + sprite->callback = SpriteCB_PokeBlock_Arc; } -static void sub_81733D4(struct Sprite *sprite) +static void SpriteCB_PokeBlock_Arc(struct Sprite *sprite) { if (TranslateAnimHorizontalArc(sprite)) { sprite->data[0] = 0; sprite->invisible = TRUE; - sprite->callback = sub_8173400; + sprite->callback = SpriteCB_ThrowPokeBlock_Free; } } -static void sub_8173400(struct Sprite *sprite) +// Destroy after end of player animation +static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *sprite) { if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animEnded) { diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index ab2f422646..9790cf9eac 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -535,9 +535,9 @@ static void sub_81170EC(u8 taskId) gTasks[taskId].func = sub_81172EC; if (sAnimStatsChangeData->data[0] == 0) - PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(-64)); + PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(-64)); else - PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(-64)); + PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(-64)); } static void sub_81172EC(u8 taskId) diff --git a/src/battle_arena.c b/src/battle_arena.c index 42a967fc64..0ffba49108 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -563,7 +563,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) } break; case 4: - PlaySE(SE_HANTEI1); + PlaySE(SE_ARENA_TIMEUP1); ShowJudgmentSprite(80, 40, ARENA_CATEGORY_MIND, B_POSITION_PLAYER_LEFT); ShowJudgmentSprite(160, 40, ARENA_CATEGORY_MIND, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); @@ -572,7 +572,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) ret = 1; break; case 5: - PlaySE(SE_HANTEI1); + PlaySE(SE_ARENA_TIMEUP1); ShowJudgmentSprite(80, 56, ARENA_CATEGORY_SKILL, B_POSITION_PLAYER_LEFT); ShowJudgmentSprite(160, 56, ARENA_CATEGORY_SKILL, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); @@ -581,7 +581,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) ret = 1; break; case 6: - PlaySE(SE_HANTEI1); + PlaySE(SE_ARENA_TIMEUP1); ShowJudgmentSprite(80, 72, ARENA_CATEGORY_BODY, B_POSITION_PLAYER_LEFT); ShowJudgmentSprite(160, 72, ARENA_CATEGORY_BODY, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); @@ -590,7 +590,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) ret = 1; break; case 7: - PlaySE(SE_HANTEI2); + PlaySE(SE_ARENA_TIMEUP2); if (gBattleTextBuff1[0] > gBattleTextBuff2[0]) { ret = 2; diff --git a/src/battle_bg.c b/src/battle_bg.c index 00c504bfd7..6a0e4c10cf 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -1105,7 +1105,7 @@ void InitLinkBattleVsScreen(u8 taskId) if (gTasks[taskId].data[5] != 0) DrawLinkBattleVsScreenOutcomeText(); - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); DestroyTask(taskId); gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE; gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE; @@ -1126,7 +1126,7 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gVsLettersGfx, (void*)(VRAM + 0x10000)); + LZDecompressVram(gVsLettersGfx, (void*)(OBJ_VRAM0)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index c463cacabb..b6278dd590 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -239,27 +239,27 @@ static void sub_8064520(void) { if (r4 || !IsBattlerSpriteVisible(BATTLE_PARTNER(gActiveBattler))) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) return; - if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1) + if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].finishedShinyMonAnim) return; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; - gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); } else { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) return; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT) { @@ -278,17 +278,17 @@ static void sub_8064734(void) bool32 r10 = FALSE; if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive - && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 - && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); } if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].ballAnimActive - && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].flag_x80 - && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1) + && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].finishedShinyMonAnim) { - sub_8172EF0(BATTLE_PARTNER(gActiveBattler), &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]]); + TryShinyAnimation(BATTLE_PARTNER(gActiveBattler), &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]]); } @@ -367,16 +367,16 @@ static void sub_8064B04(void) if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim) { - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); } else { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); LinkOpponentBufferExecCompleted(); @@ -473,11 +473,11 @@ static void sub_8064DD0(void) static void sub_8064E50(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -495,9 +495,9 @@ static void sub_8064E50(void) static void sub_8064F40(void) { if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive - && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80) + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim) { - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); } if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy @@ -1356,7 +1356,7 @@ static void LinkOpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8064C14; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 042a3fe524..c6cb101fc7 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -359,10 +359,10 @@ static void sub_814B554(void) static void sub_814B5A8(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -380,10 +380,10 @@ static void sub_814B5A8(void) static void sub_814B69C(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) { - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); } if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy @@ -1178,7 +1178,7 @@ static void LinkPartnerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index cf639a7559..4c8eff859e 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -249,23 +249,25 @@ static void sub_805F2F0(void) { if (var2 == TRUE) { - if (var2 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); } else return; } - else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { if (GetBattlerPosition(gActiveBattler) == 3) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 == 0 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 == 0) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) { FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -273,8 +275,8 @@ static void sub_805F2F0(void) else return; } - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; } else return; @@ -289,10 +291,19 @@ static void sub_805F560(void) bool32 sp = FALSE; bool32 r10 = FALSE; - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); - if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) - sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + + if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) + && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) + && IsDoubleBattle() + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) + TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) { if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80) @@ -368,13 +379,16 @@ static void sub_805F560(void) static void sub_805F994(void) { - if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0 + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); - if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); OpponentBufferExecCompleted(); @@ -463,10 +477,11 @@ static void sub_805FC80(void) static void sub_805FD00(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim + && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0); @@ -480,8 +495,9 @@ static void sub_805FD00(void) static void sub_805FDF0(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) @@ -1393,7 +1409,7 @@ static void OpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index fc94ea8b4c..1d26221fec 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -240,12 +240,12 @@ static void HandleInputChooseAction(void) DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); - if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) + if (JOY_REPEAT(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); @@ -266,7 +266,7 @@ static void HandleInputChooseAction(void) } PlayerBufferExecCompleted(); } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { if (gActionSelectionCursor[gActiveBattler] & 1) // if is B_ACTION_USE_ITEM or B_ACTION_RUN { @@ -276,7 +276,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { if (!(gActionSelectionCursor[gActiveBattler] & 1)) // if is B_ACTION_USE_MOVE or B_ACTION_SWITCH { @@ -286,7 +286,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (gActionSelectionCursor[gActiveBattler] & 2) // if is B_ACTION_SWITCH or B_ACTION_RUN { @@ -296,7 +296,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (!(gActionSelectionCursor[gActiveBattler] & 2)) // if is B_ACTION_USE_MOVE or B_ACTION_USE_ITEM { @@ -306,7 +306,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) + else if (JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59) { if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT @@ -326,7 +326,7 @@ static void HandleInputChooseAction(void) PlayerBufferExecCompleted(); } } - else if (gMain.newKeys & START_BUTTON) + else if (JOY_NEW(START_BUTTON)) { SwapHpBarsWithHpText(); } @@ -359,12 +359,12 @@ static void HandleInputChooseTarget(void) } while (i < gBattlersCount); } - if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) + if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget; @@ -372,7 +372,7 @@ static void HandleInputChooseTarget(void) EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); PlayerBufferExecCompleted(); } - else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) + else if (JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59) { PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget; @@ -381,7 +381,7 @@ static void HandleInputChooseTarget(void) DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); } - else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP)) + else if (JOY_NEW(DPAD_LEFT | DPAD_UP)) { PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget; @@ -423,7 +423,7 @@ static void HandleInputChooseTarget(void) } while (i == 0); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget; } - else if (gMain.newKeys & (DPAD_RIGHT | DPAD_DOWN)) + else if (JOY_NEW(DPAD_RIGHT | DPAD_DOWN)) { PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget; @@ -472,12 +472,12 @@ static void HandleInputChooseMove(void) bool32 canSelectTarget = FALSE; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); - if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) + if (JOY_HELD(DPAD_ANY) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { u8 moveTarget; @@ -539,13 +539,13 @@ static void HandleInputChooseMove(void) gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget; } } - else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) + else if (JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59) { PlaySE(SE_SELECT); BtlController_EmitTwoReturnValues(1, 10, 0xFFFF); PlayerBufferExecCompleted(); } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { if (gMoveSelectionCursor[gActiveBattler] & 1) { @@ -557,7 +557,7 @@ static void HandleInputChooseMove(void) MoveSelectionDisplayMoveType(); } } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { if (!(gMoveSelectionCursor[gActiveBattler] & 1) && (gMoveSelectionCursor[gActiveBattler] ^ 1) < gNumberOfMovesToChoose) @@ -570,7 +570,7 @@ static void HandleInputChooseMove(void) MoveSelectionDisplayMoveType(); } } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (gMoveSelectionCursor[gActiveBattler] & 2) { @@ -582,7 +582,7 @@ static void HandleInputChooseMove(void) MoveSelectionDisplayMoveType(); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (!(gMoveSelectionCursor[gActiveBattler] & 2) && (gMoveSelectionCursor[gActiveBattler] ^ 2) < gNumberOfMovesToChoose) @@ -595,7 +595,7 @@ static void HandleInputChooseMove(void) MoveSelectionDisplayMoveType(); } } - else if (gMain.newKeys & SELECT_BUTTON) + else if (JOY_NEW(SELECT_BUTTON)) { if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { @@ -617,26 +617,26 @@ u32 sub_8057FBC(void) // unused { u32 var = 0; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); var = 1; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; var = 0xFF; } - if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) + if (JOY_NEW(DPAD_LEFT) && gMoveSelectionCursor[gActiveBattler] & 1) { MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]); gMoveSelectionCursor[gActiveBattler] ^= 1; PlaySE(SE_SELECT); MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0); } - if (gMain.newKeys & DPAD_RIGHT && !(gMoveSelectionCursor[gActiveBattler] & 1) + if (JOY_NEW(DPAD_RIGHT) && !(gMoveSelectionCursor[gActiveBattler] & 1) && (gMoveSelectionCursor[gActiveBattler] ^ 1) < gNumberOfMovesToChoose) { MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]); @@ -644,14 +644,14 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0); } - if (gMain.newKeys & DPAD_UP && gMoveSelectionCursor[gActiveBattler] & 2) + if (JOY_NEW(DPAD_UP) && gMoveSelectionCursor[gActiveBattler] & 2) { MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]); gMoveSelectionCursor[gActiveBattler] ^= 2; PlaySE(SE_SELECT); MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0); } - if (gMain.newKeys & DPAD_DOWN && !(gMoveSelectionCursor[gActiveBattler] & 2) + if (JOY_NEW(DPAD_DOWN) && !(gMoveSelectionCursor[gActiveBattler] & 2) && (gMoveSelectionCursor[gActiveBattler] ^ 2) < gNumberOfMovesToChoose) { MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]); @@ -669,7 +669,7 @@ static void HandleMoveSwitching(void) struct ChooseMoveStruct moveStruct; u8 totalPPBonuses; - if (gMain.newKeys & (A_BUTTON | SELECT_BUTTON)) + if (JOY_NEW(A_BUTTON | SELECT_BUTTON)) { PlaySE(SE_SELECT); @@ -763,7 +763,7 @@ static void HandleMoveSwitching(void) MoveSelectionDisplayPpNumber(); MoveSelectionDisplayMoveType(); } - else if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) + else if (JOY_NEW(B_BUTTON | SELECT_BUTTON)) { PlaySE(SE_SELECT); MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor); @@ -773,7 +773,7 @@ static void HandleMoveSwitching(void) MoveSelectionDisplayPpNumber(); MoveSelectionDisplayMoveType(); } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { if (gMultiUsePlayerCursor & 1) { @@ -791,7 +791,7 @@ static void HandleMoveSwitching(void) MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); } } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { if (!(gMultiUsePlayerCursor & 1) && (gMultiUsePlayerCursor ^ 1) < gNumberOfMovesToChoose) { @@ -809,7 +809,7 @@ static void HandleMoveSwitching(void) MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); } } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (gMultiUsePlayerCursor & 2) { @@ -827,7 +827,7 @@ static void HandleMoveSwitching(void) MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (!(gMultiUsePlayerCursor & 2) && (gMultiUsePlayerCursor ^ 2) < gNumberOfMovesToChoose) { @@ -853,7 +853,7 @@ static void sub_80586F8(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8038D64); @@ -866,7 +866,7 @@ static void sub_80586F8(void) { if (IsLinkTaskFinished()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8038D64); @@ -895,7 +895,7 @@ void sub_80587B0(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -951,13 +951,13 @@ static void sub_805896C(void) var = TRUE; } - if (var && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 - && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) + if (var && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -976,10 +976,13 @@ static void sub_8058B40(void) bool32 r9 = FALSE; bool32 r8 = FALSE; - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) - sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) + TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) { @@ -1050,12 +1053,12 @@ static void sub_8058B40(void) static void sub_8058EDC(void) { if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy - && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) { CopyBattleSpriteInvisibility(gActiveBattler); - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -1079,11 +1082,9 @@ static void sub_8058FC0(void) static void sub_805902C(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - { - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); - } + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) @@ -1401,21 +1402,21 @@ static void DoHitAnimBlinkSpriteEffect(void) static void PlayerHandleUnknownYesNoInput(void) { - if (gMain.newKeys & DPAD_UP && gMultiUsePlayerCursor != 0) + if (JOY_NEW(DPAD_UP) && gMultiUsePlayerCursor != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gMultiUsePlayerCursor); gMultiUsePlayerCursor = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && gMultiUsePlayerCursor == 0) + if (JOY_NEW(DPAD_DOWN) && gMultiUsePlayerCursor == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gMultiUsePlayerCursor); gMultiUsePlayerCursor = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); @@ -1427,7 +1428,7 @@ static void PlayerHandleUnknownYesNoInput(void) PlayerBufferExecCompleted(); } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); @@ -2391,7 +2392,7 @@ static void PlayerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index ffd0f49172..ca3db17381 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -544,10 +544,10 @@ static void sub_81BB9A0(void) static void sub_81BB9F4(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -565,10 +565,10 @@ static void sub_81BB9F4(void) static void sub_81BBAE8(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) { - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); } if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy @@ -1370,7 +1370,7 @@ static void PlayerPartnerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index ce40aa7150..7bbac36e44 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -239,15 +239,15 @@ static void sub_8186678(void) { if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) return; - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) return; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); } @@ -262,10 +262,13 @@ static void sub_818686C(void) bool32 r9 = FALSE; bool32 r8 = FALSE; - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) - sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) + TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) { @@ -348,16 +351,16 @@ static void sub_8186C48(void) if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim) { - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); } else { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); RecordedOpponentBufferExecCompleted(); @@ -455,11 +458,11 @@ static void sub_8186F14(void) static void sub_8186F94(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -477,10 +480,8 @@ static void sub_8186F94(void) static void sub_8187084(void) { if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive - && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80) - { - sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); - } + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim) + TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]); if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) @@ -1283,7 +1284,7 @@ static void RecordedOpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8186D58; } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 26ad9105bd..1f4847b005 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -224,14 +224,14 @@ static void sub_8189AA0(void) } } - if (r6 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 - && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) + if (r6 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -277,16 +277,13 @@ static void sub_8189D40(void) if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - { - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); - } - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) - { - sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); - } + TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); } if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive @@ -439,10 +436,10 @@ static void sub_818A328(void) static void sub_818A37C(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -460,10 +457,10 @@ static void sub_818A37C(void) static void sub_818A470(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 - && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) { - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); } if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy @@ -1285,7 +1282,7 @@ static void RecordedPlayerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index c39b904c97..9cb427e129 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -170,7 +170,7 @@ static void SafariBufferRunCommand(void) static void HandleInputChooseAction(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); @@ -191,7 +191,7 @@ static void HandleInputChooseAction(void) } SafariBufferExecCompleted(); } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { if (gActionSelectionCursor[gActiveBattler] & 1) { @@ -201,7 +201,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { if (!(gActionSelectionCursor[gActiveBattler] & 1)) { @@ -211,7 +211,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (gActionSelectionCursor[gActiveBattler] & 2) { @@ -221,7 +221,7 @@ static void HandleInputChooseAction(void) ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (!(gActionSelectionCursor[gActiveBattler] & 2)) { @@ -389,7 +389,7 @@ static void SafariHandleSuccessBallThrowAnim(void) { gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS; gDoingBattleAnim = TRUE; - InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW); + InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW_WITH_TRAINER); gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone; } @@ -399,7 +399,7 @@ static void SafariHandleBallThrowAnim(void) gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId; gDoingBattleAnim = TRUE; - InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW); + InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW_WITH_TRAINER); gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone; } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 53d05aa35e..300837380a 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -285,10 +285,13 @@ static void CompleteOnChosenItem(void) static void sub_816864C(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) - sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) - sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) + TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); + + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim + && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive) + TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]); if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive @@ -320,14 +323,14 @@ static void sub_8168818(void) if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) r4 = TRUE; - if (r4 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 - && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1) + if (r4 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim + && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -1075,7 +1078,7 @@ static void WallyHandleSuccessBallThrowAnim(void) { gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS; gDoingBattleAnim = TRUE; - InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW); + InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW_WITH_TRAINER); gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedAnimation; } @@ -1085,7 +1088,7 @@ static void WallyHandleBallThrowAnim(void) gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId; gDoingBattleAnim = TRUE; - InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW); + InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW_WITH_TRAINER); gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedAnimation; } diff --git a/src/battle_dome.c b/src/battle_dome.c index 3654d2ccf9..2f6df5dcaf 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -49,7 +49,7 @@ // An 'Info Card' is a trainer or match information page that can be viewed on the Tourney Tree struct TourneyTreeInfoCard { - u8 spriteIds[NUM_INFOCARD_SPRITES]; + u8 spriteIds[NUM_INFOCARD_SPRITES]; u8 pos; u8 tournamentIds[NUM_INFOCARD_TRAINERS]; }; @@ -499,7 +499,7 @@ static const u8 sBattleStyleMovePoints[MOVES_COUNT][NUM_MOVE_POINT_TYPES] = [MOVE_PSYCHO_BOOST] = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_POWERFUL] = 1, [MOVE_POINTS_STRONG] = 1, [MOVE_POINTS_LOW_PP] = 1, [MOVE_POINTS_EFFECT] = 1}, }; -// This array is searched in-order to determine what battle style a tourney trainer uses. +// This array is searched in-order to determine what battle style a tourney trainer uses. // If the sum of the points for the party's moves meets/exceeds all the point totals of an element, then they use that battle style static const u8 sBattleStyleThresholds[NUM_BATTLE_STYLES - 1][NUM_MOVE_POINT_TYPES] = { @@ -1188,11 +1188,11 @@ static const u8 sIdToMatchNumber[DOME_TOURNAMENT_TRAINERS_COUNT][DOME_ROUNDS_COU { 7, 11, 13, 14}, }; -static const u8 sLastMatchCardNum[DOME_ROUNDS_COUNT] = +static const u8 sLastMatchCardNum[DOME_ROUNDS_COUNT] = { - [DOME_ROUND1] = 23, - [DOME_ROUND2] = 27, - [DOME_SEMIFINAL] = 29, + [DOME_ROUND1] = 23, + [DOME_ROUND2] = 27, + [DOME_SEMIFINAL] = 29, [DOME_FINAL] = 30 }; @@ -1324,12 +1324,12 @@ static const u8 sSpeciesNameTextYCoords[] = {0, 4, 0}; // Offsets within sBattleDomeOpponentStatsTexts for stat combinations // SPDEF has no offset because by then all stat combinations have been reached, so it has no combination texts -static const u8 sStatTextOffsets[NUM_STATS - 1] = +static const u8 sStatTextOffsets[NUM_STATS - 1] = { - DOME_TEXT_HP, - DOME_TEXT_ATK, - DOME_TEXT_DEF, - DOME_TEXT_SPEED, + DOME_TEXT_HP, + DOME_TEXT_ATK, + DOME_TEXT_DEF, + DOME_TEXT_SPEED, DOME_TEXT_SPATK }; @@ -1421,7 +1421,7 @@ static const u8 sTrainerNamePositions[DOME_TOURNAMENT_TRAINERS_COUNT][2] = static const u8 sTourneyTreePokeballCoords[DOME_TOURNAMENT_TRAINERS_COUNT + DOME_TOURNAMENT_MATCHES_COUNT][2] = { { 68, 33}, // Left side trainers - { 68, 49}, + { 68, 49}, { 68, 65}, { 68, 81}, { 68, 97}, @@ -1495,7 +1495,7 @@ static const u8 sTourneyTreePokeballCoords[DOME_TOURNAMENT_TRAINERS_COUNT + DOME {.src = 0x6021, .y = 0x10, .x = 0x09}, \ {.src = 0x6023, .y = 0x10, .x = 0x0a}, \ {.src = 0x6047, .y = 0x11, .x = 0x0a}, \ - {.src = lastSrc, .y = 0x11, .x = 0x0b}, + {.src = lastSrc, .y = 0x11, .x = 0x0b}, #define LINESECTION_ROUND1_TRAINER4(lastSrc) \ {.src = 0x602b, .y = 0x12, .x = 0x09}, \ @@ -2395,7 +2395,7 @@ static void InitDomeTrainers(void) rankingScores[i] += (monTypesCount * monLevel) / 20; } - // Seed tourney trainers according to their ranking + // Seed tourney trainers according to their ranking for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++) { for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) @@ -2676,7 +2676,7 @@ static int SelectOpponentMonsFromParty(int *partyMovePoints, bool8 allowRandom) partyPositions[i] = i; // All party mons have equal move score totals, choose randomly - if (partyMovePoints[0] == partyMovePoints[1] + if (partyMovePoints[0] == partyMovePoints[1] && partyMovePoints[0] == partyMovePoints[2]) { if (allowRandom) @@ -2731,9 +2731,6 @@ static int SelectOpponentMonsFromParty(int *partyMovePoints, bool8 allowRandom) #define TYPE_x2 40 #define TYPE_x4 80 -// Functionally equivalent, while loop is impossible to match. -// arg2 is either 2, a personality, or an OTID -#ifdef NONMATCHING static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) { int defType1, defType2, defAbility, moveType; @@ -2762,13 +2759,15 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) i += 3; continue; } - else if (TYPE_EFFECT_ATK_TYPE(i) == moveType) + if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { - // BUG: * 2 is not necessary and makes the condition always false if the ability is wonder guard. - if (TYPE_EFFECT_DEF_TYPE(i) == defType1 && (defAbility != ABILITY_WONDER_GUARD || TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE * 2)) - typePower = (typePower * TYPE_EFFECT_MULTIPLIER(i)) / 10; - if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2 && (defAbility != ABILITY_WONDER_GUARD || TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE * 2)) - typePower = (typePower * TYPE_EFFECT_MULTIPLIER(i)) / 10; + // BUG: TYPE_x2 is not necessary and makes the condition always false if the ability is wonder guard. + if (TYPE_EFFECT_DEF_TYPE(i) == defType1) + if ((defAbility == ABILITY_WONDER_GUARD && TYPE_EFFECT_MULTIPLIER(i) == TYPE_x2) || defAbility != ABILITY_WONDER_GUARD) + typePower = typePower * TYPE_EFFECT_MULTIPLIER(i) / 10; + if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2) + if ((defAbility == ABILITY_WONDER_GUARD && TYPE_EFFECT_MULTIPLIER(i) == TYPE_x2) || defAbility != ABILITY_WONDER_GUARD) + typePower = typePower * TYPE_EFFECT_MULTIPLIER(i) / 10; } i += 3; } @@ -2779,10 +2778,10 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) case 0: switch (typePower) { - case TYPE_x0_50: - case TYPE_x0_25: - case TYPE_x0: default: + case TYPE_x0: + case TYPE_x0_25: + case TYPE_x0_50: typePower = 0; break; case TYPE_x1: @@ -2799,19 +2798,19 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) case 1: switch (typePower) { - default: - case TYPE_x1: - typePower = 0; + case TYPE_x0: + typePower = 8; break; case TYPE_x0_25: typePower = 4; break; - case TYPE_x0: - typePower = 8; - break; case TYPE_x0_50: typePower = 2; break; + default: + case TYPE_x1: + typePower = 0; + break; case TYPE_x2: typePower = -2; break; @@ -2829,8 +2828,8 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) case TYPE_x0_25: typePower = -8; break; - case TYPE_x0_50: default: + case TYPE_x0_50: typePower = 0; break; case TYPE_x1: @@ -2848,247 +2847,6 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) return typePower; } -#else -NAKED -static int GetTypeEffectivenessPoints(int move, int species, int arg2) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - adds r3, r0, 0\n\ - adds r4, r1, 0\n\ - str r2, [sp]\n\ - movs r6, 0\n\ - movs r2, 0x14\n\ - cmp r3, 0\n\ - beq _0818FFF0\n\ - ldr r0, =0x0000ffff\n\ - cmp r3, r0\n\ - beq _0818FFF0\n\ - ldr r0, =gBattleMoves\n\ - lsls r1, r3, 1\n\ - adds r1, r3\n\ - lsls r1, 2\n\ - adds r3, r1, r0\n\ - ldrb r0, [r3, 0x1]\n\ - cmp r0, 0\n\ - bne _0818FFFC\n\ -_0818FFF0:\n\ - movs r0, 0\n\ - b _08190156\n\ - .pool\n\ -_0818FFFC:\n\ - ldr r1, =gBaseStats\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldrb r1, [r0, 0x6]\n\ - mov r10, r1\n\ - ldrb r1, [r0, 0x7]\n\ - mov r9, r1\n\ - ldrb r0, [r0, 0x16]\n\ - mov r8, r0\n\ - ldrb r3, [r3, 0x2]\n\ - str r3, [sp, 0x4]\n\ - cmp r0, 0x1A\n\ - bne _0819002C\n\ - cmp r3, 0x4\n\ - bne _0819002C\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - bne _081900AA\n\ - movs r2, 0x8\n\ - b _081900A4\n\ - .pool\n\ -_0819002C:\n\ - ldr r0, =gTypeEffectiveness\n\ - adds r1, r6, r0\n\ - ldrb r0, [r1]\n\ - ldr r7, =gTypeEffectiveness\n\ - cmp r0, 0xFF\n\ - beq _081900A4\n\ - adds r4, r1, 0\n\ -_0819003A:\n\ - ldrb r0, [r4]\n\ - cmp r0, 0xFE\n\ - beq _08190096\n\ - ldrb r0, [r4]\n\ - ldr r1, [sp, 0x4]\n\ - cmp r0, r1\n\ - bne _08190096\n\ - ldrb r0, [r4, 0x1]\n\ - adds r5, r6, 0x1\n\ - cmp r0, r10\n\ - bne _0819006C\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _0819005E\n\ - ldrb r0, [r4, 0x2]\n\ - cmp r0, 0x28\n\ - bne _0819006C\n\ -_0819005E:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ -_0819006C:\n\ - adds r0, r5, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, r9\n\ - bne _08190096\n\ - cmp r10, r9\n\ - beq _08190096\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _08190088\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x28\n\ - bne _08190096\n\ -_08190088:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ -_08190096:\n\ - adds r4, 0x3\n\ - adds r6, 0x3\n\ - ldr r1, =gTypeEffectiveness\n\ - adds r0, r6, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0xFF\n\ - bne _0819003A\n\ -_081900A4:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - beq _081900E0\n\ -_081900AA:\n\ - ldr r1, [sp]\n\ - cmp r1, 0x1\n\ - bgt _081900BC\n\ - cmp r1, 0\n\ - beq _081900C4\n\ - b _08190154\n\ - .pool\n\ -_081900BC:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x2\n\ - beq _08190114\n\ - b _08190154\n\ -_081900C4:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - ble _08190146\n\ - cmp r2, 0x28\n\ - beq _0819014A\n\ - cmp r2, 0x28\n\ - bgt _081900DA\n\ - cmp r2, 0x14\n\ - beq _08190104\n\ - b _08190146\n\ -_081900DA:\n\ - cmp r2, 0x50\n\ - bne _08190146\n\ - b _08190100\n\ -_081900E0:\n\ - cmp r2, 0xA\n\ - beq _08190104\n\ - cmp r2, 0xA\n\ - bgt _081900F2\n\ - cmp r2, 0\n\ - beq _08190100\n\ - cmp r2, 0x5\n\ - beq _0819014A\n\ - b _08190146\n\ -_081900F2:\n\ - cmp r2, 0x28\n\ - beq _08190108\n\ - cmp r2, 0x28\n\ - ble _08190146\n\ - cmp r2, 0x50\n\ - beq _0819010E\n\ - b _08190146\n\ -_08190100:\n\ - movs r2, 0x8\n\ - b _08190154\n\ -_08190104:\n\ - movs r2, 0x2\n\ - b _08190154\n\ -_08190108:\n\ - movs r2, 0x2\n\ - negs r2, r2\n\ - b _08190154\n\ -_0819010E:\n\ - movs r2, 0x4\n\ - negs r2, r2\n\ - b _08190154\n\ -_08190114:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - bgt _08190126\n\ - cmp r2, 0\n\ - beq _0819013A\n\ - cmp r2, 0x5\n\ - beq _08190140\n\ - b _08190146\n\ -_08190126:\n\ - cmp r2, 0x28\n\ - beq _0819014E\n\ - cmp r2, 0x28\n\ - bgt _08190134\n\ - cmp r2, 0x14\n\ - beq _0819014A\n\ - b _08190146\n\ -_08190134:\n\ - cmp r2, 0x50\n\ - beq _08190152\n\ - b _08190146\n\ -_0819013A:\n\ - movs r2, 0x10\n\ - negs r2, r2\n\ - b _08190154\n\ -_08190140:\n\ - movs r2, 0x8\n\ - negs r2, r2\n\ - b _08190154\n\ -_08190146:\n\ - movs r2, 0\n\ - b _08190154\n\ -_0819014A:\n\ - movs r2, 0x4\n\ - b _08190154\n\ -_0819014E:\n\ - movs r2, 0xC\n\ - b _08190154\n\ -_08190152:\n\ - movs r2, 0x14\n\ -_08190154:\n\ - adds r0, r2, 0\n\ -_08190156:\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - "); -} -#endif // NONMATCHING // Duplicate of GetFrontierTrainerFixedIvs // NOTE: In CreateDomeOpponentMon a tournament trainer ID (0-15) is passed instead, resulting in all IVs of 3 @@ -4353,7 +4111,7 @@ static u8 Task_GetInfoCardInput(u8 taskId) u8 tourneyId = sTourneyTreeTrainerIds[position]; u16 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) input = INFOCARD_INPUT_AB; // Next opponent card cant scroll @@ -4364,7 +4122,7 @@ static u8 Task_GetInfoCardInput(u8 taskId) { // For trainer info cards, pos is 0 when on a trainer info card (not viewing that trainer's match progression) // Scrolling up/down from a trainer info card goes to other trainer info cards - if (gMain.newKeys & DPAD_UP && sInfoCard->pos == 0) + if (JOY_NEW(DPAD_UP) && sInfoCard->pos == 0) { if (position == 0) position = DOME_TOURNAMENT_TRAINERS_COUNT - 1; @@ -4372,7 +4130,7 @@ static u8 Task_GetInfoCardInput(u8 taskId) position--; input = TRAINERCARD_INPUT_UP; } - else if (gMain.newKeys & DPAD_DOWN && sInfoCard->pos == 0) + else if (JOY_NEW(DPAD_DOWN) && sInfoCard->pos == 0) { if (position == DOME_TOURNAMENT_TRAINERS_COUNT - 1) position = 0; @@ -4381,13 +4139,13 @@ static u8 Task_GetInfoCardInput(u8 taskId) input = TRAINERCARD_INPUT_DOWN; } // Scrolling left can only be done after scrolling right - else if (gMain.newKeys & DPAD_LEFT && sInfoCard->pos != 0) + else if (JOY_NEW(DPAD_LEFT) && sInfoCard->pos != 0) { sInfoCard->pos--; input = TRAINERCARD_INPUT_LEFT; } // Scrolling right from a trainer info card shows their match progression - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { // Can only scroll right from a trainer card until the round they were eliminated if (DOME_TRAINERS[tourneyId].isEliminated && sInfoCard->pos - 1 < DOME_TRAINERS[tourneyId].eliminatedAt) @@ -4415,7 +4173,7 @@ static u8 Task_GetInfoCardInput(u8 taskId) { // For match info cards, pos is 1 when on the match card, 0 when on the left trainer, and 1 when on the right trainer // Scrolling up/down from a match info card goes to the next/previous match - if (gMain.newKeys & DPAD_UP && sInfoCard->pos == 1) + if (JOY_NEW(DPAD_UP) && sInfoCard->pos == 1) { if (position == DOME_TOURNAMENT_TRAINERS_COUNT) position = sLastMatchCardNum[roundId]; @@ -4423,7 +4181,7 @@ static u8 Task_GetInfoCardInput(u8 taskId) position--; input = MATCHCARD_INPUT_UP; } - else if (gMain.newKeys & DPAD_DOWN && sInfoCard->pos == 1) + else if (JOY_NEW(DPAD_DOWN) && sInfoCard->pos == 1) { if (position == sLastMatchCardNum[roundId]) position = DOME_TOURNAMENT_TRAINERS_COUNT; @@ -4432,12 +4190,12 @@ static u8 Task_GetInfoCardInput(u8 taskId) input = MATCHCARD_INPUT_DOWN; } // Scrolling left/right from a match info card shows the trainer info card of the competitors for that match - else if (gMain.newKeys & DPAD_LEFT && sInfoCard->pos != 0) + else if (JOY_NEW(DPAD_LEFT) && sInfoCard->pos != 0) { input = MATCHCARD_INPUT_LEFT; sInfoCard->pos--; } - else if (gMain.newKeys & DPAD_RIGHT && (sInfoCard->pos == 0 || sInfoCard->pos == 1)) + else if (JOY_NEW(DPAD_RIGHT) && (sInfoCard->pos == 0 || sInfoCard->pos == 1)) { input = MATCHCARD_INPUT_RIGHT; sInfoCard->pos++; @@ -4538,7 +4296,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) if (flags & MOVE_CARD) gSprites[sInfoCard->spriteIds[2 + i + arrId]].invisible = TRUE; } - + // Initialize the text printer textPrinter.fontId = 2; textPrinter.x = 0; @@ -4547,7 +4305,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) textPrinter.currentY = textPrinter.y; textPrinter.letterSpacing = 2; textPrinter.lineSpacing = 0; - textPrinter.unk = 0; + textPrinter.style = 0; textPrinter.fgColor = TEXT_DYNAMIC_COLOR_5; textPrinter.bgColor = TEXT_COLOR_TRANSPARENT; textPrinter.shadowColor = TEXT_DYNAMIC_COLOR_4; @@ -4776,7 +4534,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) // If 2 good stats have been found already, choose which to use if (i == 2) { - + if (allocatedArray[6] < allocatedArray[k]) { if (allocatedArray[7] < allocatedArray[k]) @@ -4893,7 +4651,7 @@ static int BufferDomeWinString(u8 matchNum, u8 *tournamentIds) for (i = sCompetitorRangeByMatch[matchNum][0]; i < sCompetitorRangeByMatch[matchNum][0] + sCompetitorRangeByMatch[matchNum][1]; i++) { tournamentId = sTourneyTreeTrainerIds2[i]; - + if (DOME_TRAINERS[tournamentId].isEliminated && DOME_TRAINERS[tournamentId].eliminatedAt >= sCompetitorRangeByMatch[matchNum][2]) { @@ -5080,7 +4838,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) textPrinter.currentY = textPrinter.y; textPrinter.letterSpacing = 0; textPrinter.lineSpacing = 0; - textPrinter.unk = 0; + textPrinter.style = 0; textPrinter.fgColor = TEXT_DYNAMIC_COLOR_5; textPrinter.bgColor = TEXT_COLOR_TRANSPARENT; textPrinter.shadowColor = TEXT_DYNAMIC_COLOR_4; @@ -5285,12 +5043,12 @@ static u8 UpdateTourneyTreeCursor(u8 taskId) int tourneyTreeCursorSpriteId = gTasks[taskId].data[1]; int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - if (gMain.newKeys == B_BUTTON || (gMain.newKeys & A_BUTTON && tourneyTreeCursorSpriteId == TOURNEY_TREE_CLOSE_BUTTON)) + if (gMain.newKeys == B_BUTTON || (JOY_NEW(A_BUTTON) && tourneyTreeCursorSpriteId == TOURNEY_TREE_CLOSE_BUTTON)) { PlaySE(SE_SELECT); selection = TOURNEY_TREE_SELECTED_CLOSE; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (tourneyTreeCursorSpriteId < DOME_TOURNAMENT_TRAINERS_COUNT) { @@ -5353,7 +5111,7 @@ static void ResolveDomeRoundWinners(void) DOME_TRAINERS[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].isEliminated = TRUE; DOME_TRAINERS[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].eliminatedAt = gSaveBlock2Ptr->frontier.curChallengeBattleNum; gSaveBlock2Ptr->frontier.domeWinningMoves[TrainerIdToTournamentId(gTrainerBattleOpponent_A)] = gBattleResults.lastUsedMovePlayer; - + // If the player's match was the final one, no NPC vs NPC matches to decide if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < DOME_FINAL) DecideRoundWinners(gSaveBlock2Ptr->frontier.curChallengeBattleNum); @@ -5363,7 +5121,7 @@ static void ResolveDomeRoundWinners(void) DOME_TRAINERS[TrainerIdToTournamentId(TRAINER_PLAYER)].isEliminated = TRUE; DOME_TRAINERS[TrainerIdToTournamentId(TRAINER_PLAYER)].eliminatedAt = gSaveBlock2Ptr->frontier.curChallengeBattleNum; gSaveBlock2Ptr->frontier.domeWinningMoves[TrainerIdToTournamentId(TRAINER_PLAYER)] = gBattleResults.lastUsedMoveOpponent; - + if (gBattleOutcome == B_OUTCOME_FORFEITED || gSpecialVar_0x8005 == DOME_PLAYER_RETIRED) DOME_TRAINERS[TrainerIdToTournamentId(TRAINER_PLAYER)].forfeited = TRUE; @@ -5401,7 +5159,7 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun movePower = 40; else if (movePower == 1) movePower = 60; - else if (moveIds[i * MAX_MON_MOVES + j] == MOVE_SELF_DESTRUCT + else if (moveIds[i * MAX_MON_MOVES + j] == MOVE_SELF_DESTRUCT || moveIds[i * MAX_MON_MOVES + j] == MOVE_EXPLOSION) movePower /= 2; @@ -5534,7 +5292,7 @@ static void Task_ShowTourneyTree(u8 taskId) gTasks[taskId].tState++; break; case 2: - sTilemapBuffer = AllocZeroed(0x800); + sTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); LZDecompressWram(gDomeTourneyLineMask_Tilemap, sTilemapBuffer); SetBgTilemapBuffer(1, sTilemapBuffer); CopyBgTilemapBufferToVram(1); @@ -5558,7 +5316,7 @@ static void Task_ShowTourneyTree(u8 taskId) { for (i = 0; i < ARRAY_COUNT(sTourneyTreePokeballCoords); i++) CreateSprite(&sTourneyTreePokeballSpriteTemplate, sTourneyTreePokeballCoords[i][0], sTourneyTreePokeballCoords[i][1], 0); - + if (gTasks[taskId].tIsPrevTourneyTree) CreateSprite(&sExitButtonSpriteTemplate, 218, 12, 0); else @@ -5578,7 +5336,7 @@ static void Task_ShowTourneyTree(u8 taskId) textPrinter.lineSpacing = 0; textPrinter.currentX = GetStringCenterAlignXOffsetWithLetterSpacing(textPrinter.fontId, textPrinter.currentChar, 0x70, textPrinter.letterSpacing); textPrinter.currentY = 1; - textPrinter.unk = 0; + textPrinter.style = 0; textPrinter.fgColor = TEXT_DYNAMIC_COLOR_5; textPrinter.bgColor = TEXT_COLOR_TRANSPARENT; textPrinter.shadowColor = TEXT_DYNAMIC_COLOR_4; @@ -5698,7 +5456,7 @@ static void Task_ShowTourneyTree(u8 taskId) gTasks[i].tState = 0; } ScanlineEffect_Clear(); - + i = 0; while (i < 91) { @@ -5713,7 +5471,7 @@ static void Task_ShowTourneyTree(u8 taskId) gScanlineEffectRegBuffers[1][i] = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; i++; } - + ScanlineEffect_SetParams(sTourneyTreeScanlineEffectParams); DestroyTask(taskId); break; @@ -5759,7 +5517,7 @@ static void Task_HandleStaticTourneyTreeInput(u8 taskId) textPrinter.y = 0; textPrinter.letterSpacing = 2; textPrinter.lineSpacing = 0; - textPrinter.unk = 0; + textPrinter.style = 0; textPrinter.fgColor = TEXT_DYNAMIC_COLOR_2; textPrinter.bgColor = TEXT_COLOR_TRANSPARENT; textPrinter.shadowColor = TEXT_DYNAMIC_COLOR_4; @@ -5794,7 +5552,7 @@ static void Task_HandleStaticTourneyTreeInput(u8 taskId) gTasks[taskId].tState = STATE_WAIT_FOR_INPUT; break; case STATE_WAIT_FOR_INPUT: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].tState = STATE_CLOSE_TOURNEY_TREE; @@ -5851,67 +5609,67 @@ static void HblankCb_TourneyTree(void) if (vCount < 42) { - REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ + REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_CLR | WININ_WIN1_OBJ; SET_WIN0H_WIN1H(0, 0); } else if (vCount < 50) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(152, 155), WIN_RANGE(85, 88)); } else if (vCount < 58) { - REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ + REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_CLR | WININ_WIN1_OBJ; SET_WIN0H_WIN1H(0, 0); } else if (vCount < 75) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(144, 152), WIN_RANGE(88, 96)); } else if (vCount < 82) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(152, 155), WIN_RANGE(85, 88)); } else if (vCount < 95) { - REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ + REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_CLR | WININ_WIN1_OBJ; SET_WIN0H_WIN1H(0, 0); } else if (vCount < 103) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(152, 155), WIN_RANGE(85, 88)); } else if (vCount < 119) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(144, 152), WIN_RANGE(88, 96)); } else if (vCount < 127) { - REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ + REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_CLR | WININ_WIN1_OBJ; SET_WIN0H_WIN1H(0, 0); } else if (vCount < 135) { - REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR + REG_WININ = WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_OBJ | WININ_WIN1_CLR; SET_WIN0H_WIN1H(WIN_RANGE(152, 155), WIN_RANGE(85, 88)); } else { - REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ + REG_WININ = WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_CLR | WININ_WIN1_OBJ; SET_WIN0H_WIN1H(0, 0); } diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 388881a1c4..a3fa275c5c 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1478,7 +1478,7 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId) gTasks[taskId].data[0] = 5; break; case 5: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (sFactorySelectScreen->yesNoCursorPos == 0) @@ -1496,7 +1496,7 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId) gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sub_819B958(4); @@ -1505,12 +1505,12 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId) gTasks[taskId].data[0] = 1; gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { PlaySE(SE_SELECT); Select_UpdateYesNoCursorPosition(-1); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { PlaySE(SE_SELECT); Select_UpdateYesNoCursorPosition(1); @@ -1538,7 +1538,7 @@ static void Task_HandleSelectionScreenMenu(u8 taskId) } break; case 3: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { u8 retVal; PlaySE(SE_SELECT); @@ -1565,7 +1565,7 @@ static void Task_HandleSelectionScreenMenu(u8 taskId) gTasks[taskId].func = Task_FromSelectScreenToSummaryScreen; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); @@ -1574,12 +1574,12 @@ static void Task_HandleSelectionScreenMenu(u8 taskId) gTasks[taskId].data[0] = 1; gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { PlaySE(SE_SELECT); Select_UpdateMenuCursorPosition(-1); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { PlaySE(SE_SELECT); Select_UpdateMenuCursorPosition(1); @@ -1618,21 +1618,21 @@ static void Task_HandleSelectionScreenChooseMons(u8 taskId) } break; case 1: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sFactorySelectScreen->unk2A2 = FALSE; gTasks[taskId].data[0] = 2; gTasks[taskId].func = Task_HandleSelectionScreenMenu; } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { PlaySE(SE_SELECT); Select_UpdateBallCursorPosition(-1); Select_PrintMonCategory(); Select_PrintMonSpecies(); } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { PlaySE(SE_SELECT); Select_UpdateBallCursorPosition(1); @@ -1641,7 +1641,7 @@ static void Task_HandleSelectionScreenChooseMons(u8 taskId) } break; case 11: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); @@ -2361,7 +2361,7 @@ static void Task_HandleSwapScreenYesNo(u8 taskId) gTasks[taskId].data[0] = 5; break; case 5: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (sFactorySwapScreen->yesNoCursorPos == 0) @@ -2380,7 +2380,7 @@ static void Task_HandleSwapScreenYesNo(u8 taskId) gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = 0; @@ -2389,12 +2389,12 @@ static void Task_HandleSwapScreenYesNo(u8 taskId) loPtr = gTasks[taskId].data[7]; gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { PlaySE(SE_SELECT); Swap_UpdateYesNoCursorPosition(-1); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { PlaySE(SE_SELECT); Swap_UpdateYesNoCursorPosition(1); @@ -2485,12 +2485,12 @@ static void Task_HandleSwapScreenMenu(u8 taskId) case 3: if (sFactorySwapScreen->unk30 != TRUE) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); Swap_RunMenuOptionFunc(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); @@ -2501,11 +2501,11 @@ static void Task_HandleSwapScreenMenu(u8 taskId) gTasks[taskId].data[5] = 1; gTasks[taskId].func = sub_819D770; } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { Swap_UpdateMenuCursorPosition(-1); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { Swap_UpdateMenuCursorPosition(1); } @@ -2526,7 +2526,7 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId) } break; case 1: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sFactorySwapScreen->unk22 = FALSE; @@ -2534,7 +2534,7 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId) sub_819EAC0(); Swap_RunActionFunc(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sFactorySwapScreen->unk22 = FALSE; @@ -2546,25 +2546,25 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId) gTasks[taskId].data[5] = 0; gTasks[taskId].func = sub_819D588; } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { Swap_UpdateBallCursorPosition(-1); Swap_PrintMonCategory(); Swap_PrintMonSpecies(); } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { Swap_UpdateBallCursorPosition(1); Swap_PrintMonCategory(); Swap_PrintMonSpecies(); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { Swap_UpdateActionCursorPosition(1); Swap_PrintMonCategory(); Swap_PrintMonSpecies(); } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { Swap_UpdateActionCursorPosition(-1); Swap_PrintMonCategory(); @@ -3929,7 +3929,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 50a5f8ad5a..e3e63f0e84 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -957,7 +957,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform } src = gMonSpritesGfxPtr->sprites[position]; - dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); + dst = (void *)(OBJ_VRAM0 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); paletteOffset = 0x100 + battlerAtk * 16; lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); @@ -1014,15 +1014,12 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite) palOffset = (battlerId * 16) + 0x100; LoadCompressedPalette(gSubstituteDollPal, palOffset, 32); } - else + else if (!IsContest()) { - if (!IsContest()) - { - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) - BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - else - BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId); - } + if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); + else + BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId); } } @@ -1058,7 +1055,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong) { if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - PlaySE(SE_HINSI); + PlaySE(SE_LOW_HEALTH); gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1; } } @@ -1067,12 +1064,12 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0; if (!IsDoubleBattle()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } } @@ -1086,7 +1083,7 @@ void BattleStopLowHpSound(void) if (IsDoubleBattle()) gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } u8 GetMonHPBarLevel(struct Pokemon *mon) diff --git a/src/battle_interface.c b/src/battle_interface.c index 12273addb1..719af6a064 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1649,7 +1649,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gBattleSpritesDataPtr->animationData->field_9_x1C++; } - PlaySE12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0); return taskId; } @@ -1852,9 +1852,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite) pan = SOUND_PAN_ATTACKER; if (sprite->data[7] != 0) - PlaySE2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan); else - PlaySE1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan); sprite->callback = SpriteCallbackDummy; } diff --git a/src/battle_main.c b/src/battle_main.c index 2477ac397a..a412165d2c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1854,7 +1854,7 @@ void BattleMainCB2(void) UpdatePaletteFade(); RunTasks(); - if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450()) + if (JOY_HELD(B_BUTTON) && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450()) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; ResetPaletteFadeControl(); @@ -1869,7 +1869,7 @@ static void FreeRestoreBattleData(void) gScanlineEffect.state = 3; gMain.inBattle = 0; ZeroEnemyPartyMons(); - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); FreeMonSpritesGfx(); FreeBattleSpritesData(); FreeBattleResources(); @@ -2114,7 +2114,7 @@ void sub_8038B74(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_8038B04; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } static void sub_8038B94(u8 taskId) @@ -2510,7 +2510,7 @@ static void sub_803939C(void) } break; case 5: - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { if (gBattleCommunication[CURSOR_POSITION] != 0) { @@ -2520,7 +2520,7 @@ static void sub_803939C(void) BattleCreateYesNoCursorAt(0); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (gBattleCommunication[CURSOR_POSITION] == 0) { @@ -2530,7 +2530,7 @@ static void sub_803939C(void) BattleCreateYesNoCursorAt(1); } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (gBattleCommunication[CURSOR_POSITION] == 0) @@ -2544,7 +2544,7 @@ static void sub_803939C(void) gBattleCommunication[MULTIUSE_STATE]++; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattleCommunication[MULTIUSE_STATE]++; @@ -2971,7 +2971,7 @@ void sub_8039E60(struct Sprite *sprite) sprite->callback = SpriteCallbackDummy_3; } -void sub_8039E84(struct Sprite *sprite) +void SpriteCB_TrainerThrowObject(struct Sprite *sprite) { StartSpriteAnim(sprite, 1); sprite->callback = sub_8039E60; @@ -3642,8 +3642,8 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void) NAKED static void BattleIntroOpponent1SendsOutMonAnimation(void) { - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ + asm_unified( + "push {r4-r6,lr}\n\ ldr r0, =gBattleTypeFlags\n\ ldr r2, [r0]\n\ movs r0, 0x80\n\ @@ -3721,8 +3721,7 @@ _0803B2F2:\n\ pop {r4-r6}\n\ pop {r0}\n\ bx r0\n\ - .pool\n\ - .syntax divided"); + .pool"); } #endif // NONMATCHING @@ -4844,40 +4843,38 @@ static void SetActionsAndBattlersTurnOrder(void) gBattleStruct->focusPunchBattlerId = 0; return; } - else + for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { - for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) + if (gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_ITEM || gChosenActionByBattler[gActiveBattler] == B_ACTION_SWITCH) { - if (gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_ITEM || gChosenActionByBattler[gActiveBattler] == B_ACTION_SWITCH) - { - gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; - gBattlerByTurnOrder[turnOrderId] = gActiveBattler; - turnOrderId++; - } + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } - for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) + } + for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) + { + if (gChosenActionByBattler[gActiveBattler] != B_ACTION_USE_ITEM && gChosenActionByBattler[gActiveBattler] != B_ACTION_SWITCH) { - if (gChosenActionByBattler[gActiveBattler] != B_ACTION_USE_ITEM && gChosenActionByBattler[gActiveBattler] != B_ACTION_SWITCH) - { - gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; - gBattlerByTurnOrder[turnOrderId] = gActiveBattler; - turnOrderId++; - } + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } - for (i = 0; i < gBattlersCount - 1; i++) + } + for (i = 0; i < gBattlersCount - 1; i++) + { + for (j = i + 1; j < gBattlersCount; j++) { - for (j = i + 1; j < gBattlersCount; j++) + u8 battler1 = gBattlerByTurnOrder[i]; + u8 battler2 = gBattlerByTurnOrder[j]; + + if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM + && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM + && gActionsByTurnOrder[i] != B_ACTION_SWITCH + && gActionsByTurnOrder[j] != B_ACTION_SWITCH) { - u8 battler1 = gBattlerByTurnOrder[i]; - u8 battler2 = gBattlerByTurnOrder[j]; - if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM - && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM - && gActionsByTurnOrder[i] != B_ACTION_SWITCH - && gActionsByTurnOrder[j] != B_ACTION_SWITCH) - { - if (GetWhoStrikesFirst(battler1, battler2, FALSE)) - SwapTurnOrder(i, j); - } + if (GetWhoStrikesFirst(battler1, battler2, FALSE)) + SwapTurnOrder(i, j); } } } @@ -4955,12 +4952,8 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) } TryClearRageStatuses(); - gCurrentTurnActionNumber = 0; -{ - // something stupid needed to match - u8 zero; - gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)]; -} + gCurrentTurnActionNumber = 0; //See comment underneath + gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; //Should be gActionsByTurnOrder[(gCurrentTurnActionNumber = 0)], but that doesn't match gDynamicBasePower = 0; gBattleStruct->dynamicMoveType = 0; gBattleMainFunc = RunTurnActionsFunctions; @@ -4983,13 +4976,10 @@ static void RunTurnActionsFunctions(void) gHitMarker &= ~(HITMARKER_x100000); gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F]; } - else + else if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another battlerId { - if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another battlerId - { - gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); - gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); - } + gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); + gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); } } @@ -5012,9 +5002,9 @@ static void HandleEndTurn_BattleWon(void) gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); else - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { @@ -5025,7 +5015,7 @@ static void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(MUS_KACHI5); + PlayBGM(MUS_VICTORY_LEAGUE); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -5033,13 +5023,13 @@ static void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(MUS_KACHI4); + PlayBGM(MUS_VICTORY_AQUA_MAGMA); break; case TRAINER_CLASS_LEADER: - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; default: - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -5272,7 +5262,7 @@ static void ReturnFromBattleToOverworld(void) SetRoamerInactive(); } - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); SetMainCallback2(gMain.savedCallback); } @@ -5819,7 +5809,7 @@ static void HandleAction_GoNear(void) static void HandleAction_SafariZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } diff --git a/src/battle_message.c b/src/battle_message.c index 191fffb016..c004665d75 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -315,23 +315,23 @@ static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!"); static const u8 sText_CriticalHit[] = _("A critical hit!"); static const u8 sText_OneHitKO[] = _("It's a one-hit KO!"); -static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); +static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); static const u8 sText_AndEllipsis[] = _("And…\p"); static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p"); static const u8 sText_NotVeryEffective[] = _("It's not very effective…"); static const u8 sText_SuperEffective[] = _("It's super effective!"); -static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p"); -static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); -static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); -static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!"); +static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p"); +static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); +static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); +static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_FLEE}Wild {B_BUFF1} fled!"); static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_WildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!"); -static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); +static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} fled!"); +static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p"); static const u8 sText_CantEscape[] = _("Can't escape!\p"); static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don't leave me like this!\p"); @@ -381,7 +381,7 @@ static const u8 sText_PkmnCuriousAboutX[] = _("{B_OPPONENT_MON1_NAME} is curious static const u8 sText_PkmnEnthralledByX[] = _("{B_OPPONENT_MON1_NAME} is enthralled by\nthe {B_BUFF1}!"); static const u8 sText_PkmnIgnoredX[] = _("{B_OPPONENT_MON1_NAME} completely ignored\nthe {B_BUFF1}!"); static const u8 sText_ThrewPokeblockAtPkmn[] = _("{B_PLAYER_NAME} threw a {POKEBLOCK}\nat the {B_OPPONENT_MON1_NAME}!"); -static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); +static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); @@ -474,8 +474,8 @@ static const u8 sText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!"); static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!"); static const u8 sText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!"); static const u8 sText_ShootSoClose[] = _("Shoot!\nIt was so close, too!"); -static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_KACHI22}\p"); -static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); +static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p"); +static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}"); static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?"); static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC."); static const u8 sText_Someones[] = _("someone's"); @@ -1346,7 +1346,7 @@ static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the static const u8 sText_ForfeitedMatch[] = _("{B_PLAYER_NAME} forfeited the match!"); static const u8 sText_Trainer1WinText[] = _("{B_TRAINER1_WIN_TEXT}"); static const u8 sText_Trainer2WinText[] = _("{B_TRAINER2_WIN_TEXT}"); -static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); +static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE SE_FLEE}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?"); @@ -2995,7 +2995,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.currentY = printerTemplate.y; printerTemplate.letterSpacing = textInfo[windowId].letterSpacing; printerTemplate.lineSpacing = textInfo[windowId].lineSpacing; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = textInfo[windowId].fgColor; printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index b015f3e0e3..9e881d3a3f 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -523,6 +523,19 @@ static const u8 sTrainerTextGroups[50][2] = {FACILITY_CLASS_HIKER, 4}, }; +enum +{ + HINT_EXIT_DIRECTION, + HINT_REMAINING_ITEMS, + HINT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_ITEMS, + HINT_EXIT_MEDIUM_REMAINING_TRAINERS, + HINT_EXIT_MEDIUM_REMAINING_ITEMS, + HINT_EXIT_FAR_REMAINING_TRAINERS, + HINT_EXIT_FAR_REMAINING_ITEMS, +}; + static const u8 *const sExitDirectionHintTexts1[] = { BattlePyramid_Text_ExitHintUp1, diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 33daed80ce..8fee578554 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -839,7 +839,7 @@ static void Task_HandlePyramidBagInput(u8 taskId) s16 *data = gTasks[taskId].data; if (MenuHelpers_CallLinkSomething() != TRUE && !gPaletteFade.active) { - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { if (gPyramidBagCursorData.unk4 != 2) { @@ -965,45 +965,45 @@ static void HandleMenuActionInput(u8 taskId) if (MenuHelpers_CallLinkSomething() != TRUE) { s8 id = Menu_GetCursorPos(); - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { if (id > 0 && IsValidMenuAction(id - 2)) { PlaySE(SE_SELECT); - sub_8199134(0, -1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (id < gPyramidBagResources->menuActionsCount - 2 && IsValidMenuAction(id + 2)) { PlaySE(SE_SELECT); - sub_8199134(0, 1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN); } } - else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { if (id & 1 && IsValidMenuAction(id - 1)) { PlaySE(SE_SELECT); - sub_8199134(-1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); } } - else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { if (!(id & 1) && IsValidMenuAction(id + 1)) { PlaySE(SE_SELECT); - sub_8199134(1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE); } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (sMenuActions[gPyramidBagResources->menuActionIds[id]].func.void_u8 != NULL) sMenuActions[gPyramidBagResources->menuActionIds[id]].func.void_u8(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sMenuActions[ACTION_CANCEL].func.void_u8(taskId); @@ -1143,7 +1143,7 @@ static void sub_81C64B4(u8 taskId) { sub_81C645C(data[8]); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); ClearStdWindowAndFrameToTransparent(3, 0); @@ -1151,7 +1151,7 @@ static void sub_81C64B4(u8 taskId) ScheduleBgCopyTilemapToVram(1); sub_81C6350(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); ClearStdWindowAndFrameToTransparent(3, 0); @@ -1179,7 +1179,7 @@ static void sub_81C65CC(u8 taskId) u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition; u16 *selectedRow = &gPyramidBagCursorData.cursorPosition; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); RemovePyramidBagItem(gSpecialVar_ItemId, data[8]); @@ -1220,7 +1220,7 @@ static void sub_81C66AC(u8 taskId) static void sub_81C66EC(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); Task_CloseBattlePyramidBagMessage(taskId); @@ -1277,7 +1277,7 @@ static void Task_ItemSwapHandleInput(u8 taskId) s16 *data = gTasks[taskId].data; if (MenuHelpers_CallLinkSomething() != TRUE) { - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { PlaySE(SE_SELECT); ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition); @@ -1295,7 +1295,7 @@ static void Task_ItemSwapHandleInput(u8 taskId) break; case LIST_CANCEL: PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) PerformItemSwap(taskId); else sub_81C6A14(taskId); diff --git a/src/battle_records.c b/src/battle_records.c index c6363a6eda..a8b9ead14b 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -356,7 +356,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId) { struct Task *task = &gTasks[taskId]; - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); task->func = Task_BeginPaletteFade; @@ -485,7 +485,7 @@ static void CB2_ShowTrainerHillRecords(void) gMain.state++; break; case 2: - sTilemapBuffer = AllocZeroed(0x800); + sTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sTrainerHillRecordsBgTemplates, ARRAY_COUNT(sTrainerHillRecordsBgTemplates)); SetBgTilemapBuffer(3, sTilemapBuffer); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b2e02b2876..7ded6fcd8f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1977,11 +1977,11 @@ static void Cmd_effectivenesssound(void) switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) { case MOVE_RESULT_SUPER_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_NOT_VERY_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_DOESNT_AFFECT_FOE: @@ -1994,17 +1994,17 @@ static void Cmd_effectivenesssound(void) default: if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) { - BtlController_EmitPlaySE(0, SE_KOUKA_M); + BtlController_EmitPlaySE(0, SE_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } break; @@ -3320,7 +3320,7 @@ static void Cmd_getexp(void) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(MUS_KACHI2); + PlayBGM(MUS_VICTORY_WILD); gBattleStruct->wildVictorySong++; } @@ -5360,21 +5360,21 @@ static void Cmd_yesnoboxlearnmove(void) BattleCreateYesNoCursorAt(0); break; case 1: - if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0) + if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0) + if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (gBattleCommunication[1] == 0) @@ -5388,7 +5388,7 @@ static void Cmd_yesnoboxlearnmove(void) gBattleScripting.learnMoveState = 5; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattleScripting.learnMoveState = 5; @@ -5477,21 +5477,21 @@ static void Cmd_yesnoboxstoplearningmove(void) BattleCreateYesNoCursorAt(0); break; case 1: - if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0) + if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0) + if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); @@ -5502,7 +5502,7 @@ static void Cmd_yesnoboxstoplearningmove(void) HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -5772,28 +5772,28 @@ static void Cmd_yesnobox(void) BattleCreateYesNoCursorAt(0); break; case 1: - if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0) + if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0) + if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { gBattleCommunication[CURSOR_POSITION] = 1; PlaySE(SE_SELECT); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); gBattlescriptCurrInstr++; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); @@ -6036,7 +6036,7 @@ static void PutLevelAndGenderOnLvlUpBox(void) printerTemplate.currentY = 0; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT; printerTemplate.shadowColor = TEXT_COLOR_DARK_GREY; @@ -6428,7 +6428,7 @@ static void Cmd_various(void) gBattleOutcome = B_OUTCOME_MON_TELEPORTED; break; case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC: - BtlController_EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE); + BtlController_EmitPlayFanfareOrBGM(0, MUS_VICTORY_TRAINER, TRUE); MarkBattlerForControllerExec(gActiveBattler); break; } @@ -9893,6 +9893,7 @@ static void Cmd_handleballthrow(void) else // not caught { gBattleCommunication[MULTISTRING_CHOOSER] = shakes; + // Maybe inject SpriteCB_TestBallThrow here gBattlescriptCurrInstr = BattleScript_ShakeBallThrow; } } @@ -10075,21 +10076,21 @@ static void Cmd_trygivecaughtmonnick(void) BattleCreateYesNoCursorAt(0); break; case 1: - if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0) + if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0) + if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (gBattleCommunication[CURSOR_POSITION] == 0) @@ -10102,7 +10103,7 @@ static void Cmd_trygivecaughtmonnick(void) gBattleCommunication[MULTIUSE_STATE] = 4; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattleCommunication[MULTIUSE_STATE] = 4; diff --git a/src/battle_setup.c b/src/battle_setup.c index 0c0ef72d31..3c20d9ffe5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -518,22 +518,22 @@ void BattleSetup_StartLegendaryBattle(void) default: case SPECIES_GROUDON: gBattleTypeFlags |= BATTLE_TYPE_GROUDON; - CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_BATTLE34); + CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_VS_KYOGRE_GROUDON); break; case SPECIES_KYOGRE: gBattleTypeFlags |= BATTLE_TYPE_KYOGRE; - CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_BATTLE34); + CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_VS_KYOGRE_GROUDON); break; case SPECIES_RAYQUAZA: gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA; - CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_REKKU); + CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_RAYQUAZA); break; case SPECIES_DEOXYS: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEO); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEOXYS); break; case SPECIES_LUGIA: case SPECIES_HO_OH: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEN); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_LEGEND); break; case SPECIES_MEW: CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_MEW); @@ -553,9 +553,9 @@ void StartGroudonKyogreBattle(void) gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_RUBY) - CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON + CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON else - CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE + CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); @@ -588,7 +588,7 @@ void StartRegiBattle(void) transitionId = B_TRANSITION_GRID_SQUARES; break; } - CreateBattleStartTask(transitionId, MUS_BATTLE36); + CreateBattleStartTask(transitionId, MUS_VS_REGI); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); @@ -1454,46 +1454,46 @@ void SetUpTrainerEncounterMusic(void) switch (GetTrainerEncounterMusicId(trainerId)) { case TRAINER_ENCOUNTER_MUSIC_MALE: - music = MUS_BOYEYE; + music = MUS_ENCOUNTER_MALE; break; case TRAINER_ENCOUNTER_MUSIC_FEMALE: - music = MUS_GIRLEYE; + music = MUS_ENCOUNTER_FEMALE; break; case TRAINER_ENCOUNTER_MUSIC_GIRL: - music = MUS_SYOUJOEYE; + music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = MUS_HAGESHII; + music = MUS_ENCOUNTER_INTENSE; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = MUS_KAKKOII; + music = MUS_ENCOUNTER_COOL; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: - music = MUS_AQA_0; + music = MUS_ENCOUNTER_AQUA; break; case TRAINER_ENCOUNTER_MUSIC_MAGMA: - music = MUS_MGM0; + music = MUS_ENCOUNTER_MAGMA; break; case TRAINER_ENCOUNTER_MUSIC_SWIMMER: - music = MUS_SWIMEYE; + music = MUS_ENCOUNTER_SWIMMER; break; case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = MUS_HUTAGO; + music = MUS_ENCOUNTER_TWINS; break; case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: - music = MUS_SITENNOU; + music = MUS_ENCOUNTER_ELITE_FOUR; break; case TRAINER_ENCOUNTER_MUSIC_HIKER: - music = MUS_YAMA_EYE; + music = MUS_ENCOUNTER_HIKER; break; case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: - music = MUS_INTER_V; + music = MUS_ENCOUNTER_INTERVIEWER; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_TEST; + music = MUS_ENCOUNTER_RICH; break; default: - music = MUS_AYASII; + music = MUS_ENCOUNTER_SUSPICIOUS; } PlayNewMapMusic(music); } diff --git a/src/battle_transition.c b/src/battle_transition.c index b0cdbd93af..559279e740 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -2227,7 +2227,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task) SetTrainerPicSlideTable(task->tPlayerSpriteId, 1); IncrementTrainerPicState(task->tOpponentSpriteId); - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); sTransitionStructPtr->VBlank_DMA++; return FALSE; diff --git a/src/battle_tv.c b/src/battle_tv.c index c84ae827b0..e3dec9a6cf 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -713,20 +713,18 @@ void BattleTv_SetDataBasedOnAnimation(u8 animationId) } } -#ifdef NONMATCHING -// for loop has an unused stack variable void TryPutLinkBattleTvShowOnAir(void) { - u16 playerBestSpecies = 0, opponentBestSpecies = 0; - s16 playerBestSum = 0, opponentBestSum = SHRT_MAX; + u16 playerBestSpecies = 0, opponentBestSpecies = 0, moveId = 0; + s16 sum = 0, playerBestSum = 0, opponentBestSum = SHRT_MAX; u8 playerBestMonId = 0, opponentBestMonId = 0; struct BattleTvMovePoints *movePoints = NULL; u8 countPlayer = 0, countOpponent = 0; - s16 sum = 0; - u16 species = 0; - u16 moveId = 0; + u16 species; s32 i, j; + int zero = 0, one = 1; // stupid variables needed to match. Feel free to get rid of them. + if (gBattleStruct->anyMonHasTransformed) return; @@ -748,7 +746,7 @@ void TryPutLinkBattleTvShowOnAir(void) if (species != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG, NULL)) { for (sum = 0, j = 0; j < MAX_MON_MOVES; j++) - sum += movePoints->points[0][i * 4 + j]; + sum += movePoints->points[zero][i * 4 + j]; if (playerBestSum < sum) { @@ -762,7 +760,7 @@ void TryPutLinkBattleTvShowOnAir(void) if (species != SPECIES_NONE && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG, NULL)) { for (sum = 0, j = 0; j < MAX_MON_MOVES; j++) - sum += movePoints->points[1][i * 4 + j]; + sum += movePoints->points[one][i * 4 + j]; if (opponentBestSum == sum) { @@ -784,9 +782,9 @@ void TryPutLinkBattleTvShowOnAir(void) for (sum = 0, i = 0, j = 0; j < MAX_MON_MOVES; j++) { - if (sum < movePoints->points[0][playerBestMonId * 4 + j]) + if (sum < movePoints->points[zero][playerBestMonId * 4 + j]) { - sum = movePoints->points[0][playerBestMonId * 4 + j]; + sum = movePoints->points[zero][playerBestMonId * 4 + j]; i = j; } } @@ -810,333 +808,6 @@ void TryPutLinkBattleTvShowOnAir(void) } } -#else -NAKED -void TryPutLinkBattleTvShowOnAir(void) -{ - asm_unified( - "push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x20\n\ - movs r0, 0\n\ - str r0, [sp]\n\ - movs r1, 0\n\ - str r1, [sp, 0x4]\n\ - movs r2, 0\n\ - str r2, [sp, 0x8]\n\ - ldr r3, =0x00007fff\n\ - str r3, [sp, 0xC]\n\ - movs r4, 0\n\ - str r4, [sp, 0x10]\n\ - movs r7, 0\n\ - str r7, [sp, 0x14]\n\ - mov r8, r0\n\ - ldr r0, =gBattleStruct\n\ - ldr r1, [r0]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB3\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _0817E42A\n\ - b _0817E670\n\ -_0817E42A:\n\ - movs r2, 0xD2\n\ - lsls r2, 1\n\ - adds r2, r1\n\ - mov r10, r2\n\ - movs r6, 0\n\ -_0817E434:\n\ - movs r0, 0x64\n\ - adds r4, r6, 0\n\ - muls r4, r0\n\ - ldr r0, =gPlayerParty\n\ - adds r0, r4, r0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E454\n\ - mov r0, r8\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ -_0817E454:\n\ - ldr r5, =gEnemyParty\n\ - adds r0, r4, r5\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E46A\n\ - adds r0, r7, 0x1\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ -_0817E46A:\n\ - adds r6, 0x1\n\ - cmp r6, 0x5\n\ - ble _0817E434\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0817E47E\n\ - b _0817E670\n\ -_0817E47E:\n\ - cmp r8, r7\n\ - beq _0817E484\n\ - b _0817E670\n\ -_0817E484:\n\ - movs r6, 0\n\ - lsls r3, r6, 1\n\ - str r3, [sp, 0x18]\n\ - movs r4, 0x64\n\ - mov r8, r4\n\ -_0817E48E:\n\ - mov r1, r8\n\ - muls r1, r6\n\ - ldr r0, =gPlayerParty\n\ - adds r4, r1, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - adds r0, r6, 0x1\n\ - mov r9, r0\n\ - cmp r7, 0\n\ - beq _0817E4EE\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E4EE\n\ - movs r4, 0\n\ - lsls r0, r6, 3\n\ - mov r2, r10\n\ - adds r1, r0, r2\n\ - movs r3, 0x3\n\ -_0817E4C4:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E4C4\n\ - ldr r1, [sp, 0x8]\n\ - lsls r0, r1, 16\n\ - lsls r1, r4, 16\n\ - cmp r0, r1\n\ - bge _0817E4EE\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x10]\n\ - lsrs r1, 16\n\ - str r1, [sp, 0x8]\n\ - str r7, [sp]\n\ -_0817E4EE:\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r2, =gEnemyParty\n\ - adds r4, r0, r2\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - ldr r3, [sp, 0x8]\n\ - lsls r3, 16\n\ - str r3, [sp, 0x1C]\n\ - cmp r7, 0\n\ - beq _0817E5A0\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E5A0\n\ - movs r4, 0\n\ - ldr r0, [sp, 0xC]\n\ - lsls r2, r0, 16\n\ - movs r3, 0x1\n\ - lsls r1, r3, 1\n\ - adds r1, 0x1\n\ - lsls r1, 4\n\ - lsls r0, r6, 3\n\ - adds r0, r1\n\ - mov r3, r10\n\ - adds r1, r0, r3\n\ - movs r3, 0x3\n\ -_0817E534:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E534\n\ - asrs r1, r2, 16\n\ - lsls r5, r4, 16\n\ - asrs r0, r5, 16\n\ - cmp r1, r0\n\ - bne _0817E590\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r1, =gEnemyParty\n\ - adds r0, r1\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - adds r4, r0, 0\n\ - ldr r2, [sp, 0x14]\n\ - mov r0, r8\n\ - muls r0, r2\n\ - ldr r3, =gEnemyParty\n\ - adds r0, r3\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r4, r0\n\ - bls _0817E5A0\n\ - b _0817E594\n\ - .pool\n\ -_0817E590:\n\ - cmp r1, r0\n\ - ble _0817E5A0\n\ -_0817E594:\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x14]\n\ - lsrs r5, 16\n\ - str r5, [sp, 0xC]\n\ - str r7, [sp, 0x4]\n\ -_0817E5A0:\n\ - mov r6, r9\n\ - cmp r6, 0x5\n\ - bgt _0817E5A8\n\ - b _0817E48E\n\ -_0817E5A8:\n\ - movs r4, 0\n\ - movs r6, 0\n\ - movs r3, 0\n\ - ldr r5, =gPlayerParty\n\ - ldr r7, [sp, 0x10]\n\ - lsls r0, r7, 3\n\ - mov r1, r10\n\ - adds r2, r0, r1\n\ -_0817E5B8:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - movs r7, 0\n\ - ldrsh r1, [r2, r7]\n\ - cmp r0, r1\n\ - bge _0817E5C8\n\ - ldrh r4, [r2]\n\ - adds r6, r3, 0\n\ -_0817E5C8:\n\ - adds r2, 0x2\n\ - adds r3, 0x1\n\ - cmp r3, 0x3\n\ - ble _0817E5B8\n\ - movs r0, 0x64\n\ - ldr r1, [sp, 0x10]\n\ - muls r0, r1\n\ - adds r0, r5\n\ - adds r1, r6, 0\n\ - adds r1, 0xD\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - ldr r2, [sp, 0x1C]\n\ - cmp r2, 0\n\ - beq _0817E670\n\ - cmp r4, 0\n\ - beq _0817E670\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0817E65C\n\ - ldr r3, [sp, 0x10]\n\ - cmp r3, 0x2\n\ - bhi _0817E620\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E630\n\ - b _0817E670\n\ - .pool\n\ -_0817E620:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E670\n\ -_0817E630:\n\ - movs r3, 0\n\ - ldr r7, [sp, 0x14]\n\ - cmp r7, 0x2\n\ - bls _0817E63A\n\ - movs r3, 0x1\n\ -_0817E63A:\n\ - lsls r0, r3, 24\n\ - lsrs r0, 24\n\ - ldr r1, =gBattleScripting\n\ - adds r1, 0x25\n\ - ldrb r1, [r1]\n\ - bl sub_806EF84\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ - b _0817E670\n\ - .pool\n\ -_0817E65C:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r1, [r0]\n\ - movs r0, 0x1\n\ - eors r0, r1\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ -_0817E670:\n\ - add sp, 0x20\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); -} -#endif - static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) { struct BattleTvMovePoints *movePoints = &gBattleStruct->tvMovePoints; diff --git a/src/berry_blender.c b/src/berry_blender.c index 8d6f3a8fd2..2cdb841ee1 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1,5 +1,4 @@ #include "global.h" -#include "constants/game_stat.h" #include "overworld.h" #include "berry_blender.h" #include "bg.h" @@ -7,7 +6,6 @@ #include "task.h" #include "sprite.h" #include "sound.h" -#include "constants/songs.h" #include "m4a.h" #include "bg.h" #include "palette.h" @@ -19,10 +17,10 @@ #include "event_data.h" #include "main.h" #include "link.h" +#include "link_rfu.h" #include "item_menu_icons.h" #include "berry.h" #include "item.h" -#include "constants/items.h" #include "string_util.h" #include "international_string_util.h" #include "random.h" @@ -35,43 +33,97 @@ #include "graphics.h" #include "new_game.h" #include "save.h" -#include "link.h" +#include "strings.h" #include "constants/berry.h" +#include "constants/game_stat.h" +#include "constants/items.h" #include "constants/rgb.h" +#include "constants/songs.h" -#define BLENDER_SCORE_BEST 0 -#define BLENDER_SCORE_GOOD 1 -#define BLENDER_SCORE_MISS 2 +enum { + SCORE_BEST, + SCORE_GOOD, + SCORE_MISS, + NUM_SCORE_TYPES, +}; -#define BLENDER_MAX_PLAYERS 4 -#define BLENDER_SCORES_NO 3 +// Redundant with the above. Reversed +enum { + PROXIMITY_MISS, + PROXIMITY_GOOD, + PROXIMITY_BEST, +}; -enum -{ - PLAY_AGAIN_OK, - DONT_PLAY_AGAIN, +enum { + SCOREANIM_GOOD, + SCOREANIM_MISS, + SCOREANIM_BEST_FLASH, + SCOREANIM_BEST_STATIC, +}; + +enum { + PLAY_AGAIN_YES, + PLAY_AGAIN_NO, CANT_PLAY_NO_BERRIES, CANT_PLAY_NO_PKBLCK_SPACE }; +enum { + BLENDER_MISTER, + BLENDER_LADDIE, + BLENDER_LASSIE, + BLENDER_MASTER, + BLENDER_DUDE, + BLENDER_MISS +}; + +#define BLENDER_MAX_PLAYERS MAX_LINK_PLAYERS + +#define NO_PLAYER 0xFF + +#define MAX_PROGRESS_BAR 1000 + +#define MAX_ARROW_POS 0x10000 // By virtue of being u16 +#define MIN_ARROW_SPEED 0x80 +#define ARROW_FALL_ROTATION 0x5800 // The amount the arrow spins as it falls in at the start + +// Tile offsets +#define PROGRESS_BAR_FILLED_TOP 0x80E9 +#define PROGRESS_BAR_FILLED_BOTTOM 0x80F9 +#define PROGRESS_BAR_EMPTY_TOP 0x80E1 +#define PROGRESS_BAR_EMPTY_BOTTOM 0x80F1 +#define RPM_DIGIT 0x8072 + +// Tile and palette tags +#define GFXTAG_COUNTDOWN_NUMBERS 12345 +#define GFXTAG_START 12346 +#define GFXTAG_PARTICLES 23456 +#define GFXTAG_PLAYER_ARROW 46545 +#define GFXTAG_SCORE_SYMBOLS 48888 + +#define PALTAG_PLAYER_ARROW 12312 +#define PALTAG_MISC 46546 + +// Last berry that an NPC can put in +#define NUM_NPC_BERRIES ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) + struct BlenderBerry { u16 itemId; u8 name[BERRY_NAME_LENGTH + 1]; - u8 flavors[FLAVOR_COUNT]; - u8 smoothness; + u8 flavors[FLAVOR_COUNT + 1]; // 5 flavors, + 1 for feel }; struct TimeAndRPM { u32 time; - u16 max_RPM; + u16 maxRPM; }; struct BlenderGameBlock { struct TimeAndRPM timeRPM; - u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO]; + u16 scores[BLENDER_MAX_PLAYERS][NUM_SCORE_TYPES]; }; struct TvBlenderStruct @@ -82,138 +134,122 @@ struct TvBlenderStruct u8 pokeblockSheen; }; -struct BerryBlenderData +struct BerryBlender { u8 mainState; u8 loadGfxState; - u8 unused_02[0x42]; - u16 field_44; - u8 scoreIconIds[BLENDER_SCORES_NO]; + u8 unused0[66]; + u16 unk0; // never read + u8 scoreIconIds[NUM_SCORE_TYPES]; u16 arrowPos; - s16 field_4C; - u16 max_RPM; - u8 syncArrowSpriteIds[BLENDER_MAX_PLAYERS]; - u8 syncArrowSprite2Ids[BLENDER_MAX_PLAYERS]; - u8 unused_57[0xB]; + s16 speed; + u16 maxRPM; + u8 playerArrowSpriteIds[BLENDER_MAX_PLAYERS]; + u8 playerArrowSpriteIds2[BLENDER_MAX_PLAYERS]; + u8 unused1[11]; u8 gameEndState; - u16 field_64[BLENDER_MAX_PLAYERS]; - u16 field_6C; - u16 field_6E; + u16 playerContinueResponses[BLENDER_MAX_PLAYERS]; + u16 canceledPlayerCmd; + u16 canceledPlayerId; u16 playAgainState; - u8 field_72; + u8 slowdownTimer; u16 chosenItemId[BLENDER_MAX_PLAYERS]; - u8 playersNo; - u8 unused_7D[0x10]; - u16 field_8E[BLENDER_MAX_PLAYERS]; - u16 field_96[BLENDER_MAX_PLAYERS]; + u8 numPlayers; + u8 unused2[16]; + u16 arrowIdToPlayerId[BLENDER_MAX_PLAYERS]; + u16 playerIdToArrowId[BLENDER_MAX_PLAYERS]; u8 yesNoAnswer; u8 stringVar[100]; u32 gameFrameTime; s32 framesToWait; - u32 field_10C; - u8 unused_110[4]; - u8 field_114; - u16 field_116; - u16 field_118; - u16 field_11A; + u32 unk1; // never read + u8 unused3[4]; + u8 playerToThrowBerry; + u16 progressBarValue; + u16 maxProgressBarValue; + u16 centerScale; s16 bg_X; s16 bg_Y; - u8 field_120[3]; - u8 field_123; - u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO]; + u8 opponentTaskIds[BLENDER_MAX_PLAYERS - 1]; + u8 perfectOpponents; // for debugging, NPCs will always hit Best + u16 scores[BLENDER_MAX_PLAYERS][NUM_SCORE_TYPES]; u8 playerPlaces[BLENDER_MAX_PLAYERS]; struct BgAffineSrcData bgAffineSrc; - u16 field_154; + u16 savedMusic; struct BlenderBerry blendedBerries[BLENDER_MAX_PLAYERS]; struct TimeAndRPM smallBlock; - u32 field_1A0; - u8 field_1A4; + u32 linkPlayAgainState; + u8 ownRanking; struct TvBlenderStruct tvBlender; - u8 tilemapBuffers[2][0x800]; + u8 tilemapBuffers[2][BG_SCREEN_SIZE]; s16 textState; void *tilesBuffer; struct BlenderGameBlock gameBlock; }; -extern struct MusicPlayerInfo gMPlayInfo_SE2; -extern struct MusicPlayerInfo gMPlayInfo_BGM; +static void SetBgPos(void); +static void Task_HandleOpponent1(u8); +static void Task_HandleOpponent2(u8); +static void Task_HandleOpponent3(u8); +static void Task_HandleBerryMaster(u8); +static void Task_PlayPokeblockFanfare(u8); +static void SpriteCB_PlayerArrow(struct Sprite *); +static void SpriteCB_ScoreSymbol(struct Sprite *); +static void SpriteCB_CountdownNumber(struct Sprite *); +static void SpriteCB_Start(struct Sprite *); +static void SpriteCB_ScoreSymbolBest(struct Sprite *); +static void InitLocalPlayers(u8); +static void CB2_LoadBerryBlender(void); +static void UpdateBlenderCenter(void); +static bool32 Blender_PrintText(s16 *, const u8 *, s32 ); +static void StartBlender(void); +static void CB2_StartBlenderLink(void); +static void CB2_StartBlenderLocal(void); +static void Blender_DummiedOutFunc(s16, s16); +static void CB2_PlayBlender(void); +static void DrawBlenderCenter(struct BgAffineSrcData *); +static bool8 UpdateBlenderLandScreenShake(void); +static void SetPlayerIdMaps(void); +static void PrintPlayerNames(void); +static void InitBlenderBgs(void); +static void SetPlayerBerryData(u8, u16); +static void Blender_AddTextPrinter(u8, const u8 *, u8, u8, s32, s32); +static void ResetLinkCmds(void); +static void CreateParticleSprites(void); +static void ShakeBgCoordForHit(s16*, u16); +static void TryUpdateProgressBar(u16, u16); +static void UpdateRPM(u16); +static void RestoreBgCoords(void); +static void ProcessLinkPlayerCmds(void); +static void CB2_EndBlenderGame(void); +static bool8 PrintBlendingRanking(void); +static bool8 PrintBlendingResults(void); +static void CB2_CheckPlayAgainLocal(void); +static void CB2_CheckPlayAgainLink(void); +static void UpdateProgressBar(u16, u16); +static void PrintMadePokeblockString(struct Pokeblock *, u8 *); +static bool32 TryAddContestLinkTvShow(struct Pokeblock *, struct TvBlenderStruct *); -// text -extern const u8 gText_SavingDontTurnOff2[]; -extern const u8 gText_Space[]; -extern const u8 gText_BlenderMaxSpeedRecord[]; -extern const u8 gText_234Players[]; +EWRAM_DATA static struct BerryBlender *sBerryBlender = NULL; +EWRAM_DATA static s32 sDebug_PokeblockFactorFlavors[FLAVOR_COUNT] = {0}; +EWRAM_DATA static s32 sDebug_PokeblockFactorFlavorsAfterRPM[FLAVOR_COUNT] = {0}; +EWRAM_DATA static u32 sDebug_PokeblockFactorRPM = 0; -// this file's functions -static void BerryBlender_SetBackgroundsPos(void); -static void sub_8080EA4(u8 taskId); -static void sub_8080FD0(u8 taskId); -static void sub_80810F8(u8 taskId); -static void sub_8081224(u8 taskId); -static void sub_8083F3C(u8 taskId); -static void sub_80833F8(struct Sprite *sprite); -static void sub_8082F68(struct Sprite *sprite); -static void sub_8083010(struct Sprite *sprite); -static void sub_80830C0(struct Sprite *sprite); -static void sub_8082F9C(struct Sprite *sprite); -static void Blender_SetPlayerNamesLocal(u8 opponentsNum); -static void sub_807FAC8(void); -static void sub_8082D28(void); -static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed); -static void sub_807FFA4(void); -static void sub_8080018(void); -static void sub_80808D4(void); -static void Blender_DummiedOutFunc(s16 a0, s16 a1); -static void sub_8081898(void); -static void sub_8082CB4(struct BgAffineSrcData *bgAffineSrc); -static bool8 sub_8083380(void); -static void sub_808074C(void); -static void Blender_PrintPlayerNames(void); -static void sub_8080588(void); -static void Blender_SetParticipantBerryData(u8 participantId, u16 itemId); -static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s32 speed, s32 caseId); -static void sub_8080DF8(void); -static void sub_8082E84(void); -static void sub_80832BC(s16* a0, u16 a1); -static void sub_8083140(u16 a0, u16 a2); -static void sub_8083230(u16 a0); -static void sub_808330C(void); -static void sub_8082AD4(void); -static void CB2_HandleBlenderEndGame(void); -static bool8 Blender_PrintBlendingRanking(void); -static bool8 Blender_PrintBlendingResults(void); -static void CB2_HandlePlayerPlayAgainChoice(void); -static void CB2_HandlePlayerLinkPlayAgainChoice(void); -static void sub_8083170(u16 a0, u16 a1); -static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst); -static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *a1); +static s16 sPokeblockFlavors[FLAVOR_COUNT + 1]; // + 1 for feel +static s16 sPokeblockPresentFlavors[FLAVOR_COUNT + 1]; +static s16 sDebug_MaxRPMStage; +static s16 sDebug_GameTimeStage; -// EWRAM -EWRAM_DATA static struct BerryBlenderData *sBerryBlenderData = NULL; -EWRAM_DATA static s32 sUnknown_020322A8[5] = {0}; -EWRAM_DATA static s32 sUnknown_020322BC[5] = {0}; -EWRAM_DATA static u32 sUnknown_020322D0 = 0; - -// IWRAM bss -static s16 sUnknown_03000DE8[8]; -static s16 sUnknown_03000DF8[6]; -static s16 sUnknown_03000E04; -static s16 sUnknown_03000E06; - -// IWRAM common u8 gInGameOpponentsNo; -// rom +static const u16 sBlenderCenter_Pal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); +static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); +static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal"); -static const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); -static const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); -static const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal"); +static const u16 sUnused_Pal[] = INCBIN_U16("graphics/berry_blender/unused.gbapal"); +static const u16 sEmpty_Pal[16 * 14] = {0}; -// unreferenced pals? -static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/unknown_339514.gbapal"); -static const u16 sUnknownArray_1[224] = {0}; - -// unused text? +// unused text static const u8 sUnusedText_YesNo[] = _("YES\nNO"); static const u8 sUnusedText_2[] = _("▶"); static const u8 sUnusedText_Space[] = _(" "); @@ -232,22 +268,12 @@ static const u8 sText_Miss[] = _("MISS"); static const u8* const sBlenderOpponentsNames[] = { - sText_Mister, - sText_Laddie, - sText_Lassie, - sText_Master, - sText_Dude, - sText_Miss -}; - -enum -{ - BLENDER_MISTER, - BLENDER_LADDIE, - BLENDER_LASSIE, - BLENDER_MASTER, - BLENDER_DUDE, - BLENDER_MISS + [BLENDER_MISTER] = sText_Mister, + [BLENDER_LADDIE] = sText_Laddie, + [BLENDER_LASSIE] = sText_Lassie, + [BLENDER_MASTER] = sText_Master, + [BLENDER_DUDE] = sText_Dude, + [BLENDER_MISS] = sText_Miss }; static const u8 sText_PressAToStart[] = _("Press the A Button to start."); @@ -274,7 +300,7 @@ static const u8 sText_TheLevelIs[] = _("The level is "); static const u8 sText_TheFeelIs[] = _(", and the feel is "); static const u8 sText_Dot2[] = _("."); -static const struct BgTemplate sBerryBlenderBgTemplates[3] = +static const struct BgTemplate sBgTemplates[3] = { { .bg = 0, @@ -305,7 +331,7 @@ static const struct BgTemplate sBerryBlenderBgTemplates[3] = } }; -static const struct WindowTemplate sBerryBlender_WindowTemplates[] = +static const struct WindowTemplate sWindowTemplates[] = { { .bg = 0, @@ -364,7 +390,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate sBlender_YesNoWindowTemplate = +static const struct WindowTemplate sYesNoWindowTemplate_ContinuePlaying = { .bg = 0, .tilemapLeft = 21, @@ -375,31 +401,58 @@ static const struct WindowTemplate sBlender_YesNoWindowTemplate = .baseBlock = 0xCC }; -static const s8 sUnknown_083399C0[][2] = +static const s8 sPlayerArrowQuadrant[BLENDER_MAX_PLAYERS][2] = { - {-1, -1}, {1, -1}, {-1, 1}, {1, 1} + {-1, -1}, + { 1, -1}, + {-1, 1}, + { 1, 1} }; -static const u8 sBlenderSyncArrowsPos[BLENDER_MAX_PLAYERS][2] = +static const u8 sPlayerArrowPos[BLENDER_MAX_PLAYERS][2] = { - {72, 32}, {168, 32}, {72, 128}, {168, 128} + { 72, 32}, + {168, 32}, + { 72, 128}, + {168, 128} }; -static const u8 sUnknown_083399D0[3][4] = +static const u8 sPlayerIdMap[BLENDER_MAX_PLAYERS - 1][BLENDER_MAX_PLAYERS] = { - {-1, 0, 1, -1}, {-1, 0, 1, 2}, {0, 1, 2, 3} + {NO_PLAYER, 0, 1, NO_PLAYER}, // 2 Players + {NO_PLAYER, 0, 1, 2}, // 3 Players + { 0, 1, 2, 3} // 4 Players }; -static const u16 sUnknown_083399DC[] = {0, 0xC000, 0x4000, 0x8000}; -static const u8 sUnknown_083399E4[] = {1, 1, 0}; -static const u8 sUnknown_083399E7[] = {32, 224, 96, 160, 0}; -static const TaskFunc sUnknown_083399EC[] = +// Blender arrow positions: +// +// 0x0000 (limit 0x10000) +// . . +// . . +// 0x4000 . . 0xC000 +// . . +// . . +// . . +// 0x8000 +// +static const u16 sArrowStartPos[] = { + 0, + MAX_ARROW_POS / 4 * 3, // 0xC000 + MAX_ARROW_POS / 4, // 0x4000 + MAX_ARROW_POS / 4 * 2 // 0x8000 +}; +static const u8 sArrowStartPosIds[BLENDER_MAX_PLAYERS - 1] = {1, 1, 0}; +static const u8 sArrowHitRangeStart[BLENDER_MAX_PLAYERS] = {32, 224, 96, 160}; + +static const TaskFunc sLocalOpponentTasks[] = { - sub_8080EA4, sub_8080FD0, sub_80810F8 + Task_HandleOpponent1, + Task_HandleOpponent2, + Task_HandleOpponent3 }; -static const struct OamData sOamData_8216314 = +static const struct OamData sOam_PlayerArrow = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -416,40 +469,40 @@ static const struct OamData sOamData_8216314 = .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_821631C[] = +static const union AnimCmd sAnim_PlayerArrow_TopLeft[] = { - ANIMCMD_FRAME(16, 5, 1, 1), + ANIMCMD_FRAME(16, 5, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216324[] = +static const union AnimCmd sAnim_PlayerArrow_TopRight[] = { ANIMCMD_FRAME(16, 5, .vFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821632C[] = +static const union AnimCmd sAnim_PlayerArrow_BottomLeft[] = { ANIMCMD_FRAME(16, 5, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216334[] = +static const union AnimCmd sAnim_PlayerArrow_BottomRight[] = { ANIMCMD_FRAME(16, 5, 0, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821633C[] = +static const union AnimCmd sAnim_PlayerArrow_TopLeft_Flash[] = { - ANIMCMD_FRAME(48, 2, 1, 1), - ANIMCMD_FRAME(32, 5, 1, 1), - ANIMCMD_FRAME(48, 3, 1, 1), - ANIMCMD_FRAME(16, 5, 1, 1), + ANIMCMD_FRAME(48, 2, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(32, 5, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(48, 3, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(16, 5, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216350[] = +static const union AnimCmd sAnim_PlayerArrow_TopRight_Flash[] = { ANIMCMD_FRAME(48, 2, .vFlip = TRUE), ANIMCMD_FRAME(32, 5, .vFlip = TRUE), @@ -458,7 +511,7 @@ static const union AnimCmd sSpriteAnim_8216350[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216364[] = +static const union AnimCmd sAnim_PlayerArrow_BottomLeft_Flash[] = { ANIMCMD_FRAME(48, 2, .hFlip = TRUE), ANIMCMD_FRAME(32, 5, .hFlip = TRUE), @@ -467,7 +520,7 @@ static const union AnimCmd sSpriteAnim_8216364[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216378[] = +static const union AnimCmd sAnim_PlayerArrow_BottomRight_Flash[] = { ANIMCMD_FRAME(48, 2, 0, 0), ANIMCMD_FRAME(32, 5, 0, 0), @@ -476,73 +529,73 @@ static const union AnimCmd sSpriteAnim_8216378[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821638C[] = +static const union AnimCmd sAnim_PlayerArrow_TopLeft_Off[] = { - ANIMCMD_FRAME(0, 5, 1, 1), + ANIMCMD_FRAME(0, 5, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216394[] = +static const union AnimCmd sAnim_PlayerArrow_TopRight_Off[] = { ANIMCMD_FRAME(0, 5, .vFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821639C[] = +static const union AnimCmd sAnim_PlayerArrow_BottomLeft_Off[] = { ANIMCMD_FRAME(0, 5, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_82163A4[] = +static const union AnimCmd sAnim_PlayerArrow_BottomRight_Off[] = { ANIMCMD_FRAME(0, 5, 0, 0), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_82163AC[] = +static const union AnimCmd *const sAnims_PlayerArrow[] = { - sSpriteAnim_821631C, - sSpriteAnim_8216324, - sSpriteAnim_821632C, - sSpriteAnim_8216334, - sSpriteAnim_821633C, - sSpriteAnim_8216350, - sSpriteAnim_8216364, - sSpriteAnim_8216378, - sSpriteAnim_821638C, - sSpriteAnim_8216394, - sSpriteAnim_821639C, - sSpriteAnim_82163A4 + sAnim_PlayerArrow_TopLeft, + sAnim_PlayerArrow_TopRight, + sAnim_PlayerArrow_BottomLeft, + sAnim_PlayerArrow_BottomRight, + sAnim_PlayerArrow_TopLeft_Flash, + sAnim_PlayerArrow_TopRight_Flash, + sAnim_PlayerArrow_BottomLeft_Flash, + sAnim_PlayerArrow_BottomRight_Flash, + sAnim_PlayerArrow_TopLeft_Off, + sAnim_PlayerArrow_TopRight_Off, + sAnim_PlayerArrow_BottomLeft_Off, + sAnim_PlayerArrow_BottomRight_Off }; -static const struct SpriteSheet sSpriteSheet_BlenderArrow = +static const struct SpriteSheet sSpriteSheet_PlayerArrow = { - gBerryBlenderArrowTiles, 0x800, 46545 + gBerryBlenderPlayerArrow_Gfx, 0x800, GFXTAG_PLAYER_ARROW }; static const struct SpritePalette sSpritePal_BlenderMisc = { - gBerryBlenderMiscPalette, 46546 + gBerryBlenderMiscPalette, PALTAG_MISC }; -static const struct SpritePalette sSpritePal_BlenderArrow = +static const struct SpritePalette sSpritePal_PlayerArrow = { - gBerryBlenderArrowPalette, 12312 + gBerryBlenderArrowPalette, PALTAG_PLAYER_ARROW }; -static const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate = +static const struct SpriteTemplate sSpriteTemplate_PlayerArrow = { - .tileTag = 46545, - .paletteTag = 12312, - .oam = &sOamData_8216314, - .anims = sSpriteAnimTable_82163AC, + .tileTag = GFXTAG_PLAYER_ARROW, + .paletteTag = PALTAG_PLAYER_ARROW, + .oam = &sOam_PlayerArrow, + .anims = sAnims_PlayerArrow, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80833F8 + .callback = SpriteCB_PlayerArrow }; -static const struct OamData sOamData_821640C = +static const struct OamData sOam_ScoreSymbols = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -559,19 +612,19 @@ static const struct OamData sOamData_821640C = .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_8216414[] = +static const union AnimCmd sAnim_ScoreSymbols_Good[] = { ANIMCMD_FRAME(0, 20), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821641C[] = +static const union AnimCmd sAnim_ScoreSymbols_Miss[] = { ANIMCMD_FRAME(4, 20, 1, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216424[] = +static const union AnimCmd sAnim_ScoreSymbols_BestFlash[] = { ANIMCMD_FRAME(8, 4), ANIMCMD_FRAME(12, 4), @@ -581,37 +634,37 @@ static const union AnimCmd sSpriteAnim_8216424[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821643C[] = +static const union AnimCmd sAnim_ScoreSymbols_BestStatic[] = { ANIMCMD_FRAME(8, 4), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8216444[] = +static const union AnimCmd *const sAnims_ScoreSymbols[] = { - sSpriteAnim_8216414, - sSpriteAnim_821641C, - sSpriteAnim_8216424, - sSpriteAnim_821643C, + [SCOREANIM_GOOD] = sAnim_ScoreSymbols_Good, + [SCOREANIM_MISS] = sAnim_ScoreSymbols_Miss, + [SCOREANIM_BEST_FLASH] = sAnim_ScoreSymbols_BestFlash, + [SCOREANIM_BEST_STATIC] = sAnim_ScoreSymbols_BestStatic, }; -static const struct SpriteSheet sUnknown_08339B38 = +static const struct SpriteSheet sSpriteSheet_ScoreSymbols = { - gBerryBlenderMarubatsuTiles, 0x200, 48888 + gBerryBlenderScoreSymbols_Gfx, 0x200, GFXTAG_SCORE_SYMBOLS }; -static const struct SpriteTemplate sUnknown_08339B40 = +static const struct SpriteTemplate sSpriteTemplate_ScoreSymbols = { - .tileTag = 48888, - .paletteTag = 46546, - .oam = &sOamData_821640C, - .anims = sSpriteAnimTable_8216444, + .tileTag = GFXTAG_SCORE_SYMBOLS, + .paletteTag = PALTAG_MISC, + .oam = &sOam_ScoreSymbols, + .anims = sAnims_ScoreSymbols, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8082F68 + .callback = SpriteCB_ScoreSymbol }; -static const struct OamData sOamData_8216474 = +static const struct OamData sOam_Particles = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -628,7 +681,7 @@ static const struct OamData sOamData_8216474 = .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_821647C[] = +static const union AnimCmd sAnim_SparkleCrossToX[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(1, 4), @@ -638,7 +691,7 @@ static const union AnimCmd sSpriteAnim_821647C[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216494[] = +static const union AnimCmd sAnim_SparkleXToCross[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(2, 4), @@ -648,7 +701,7 @@ static const union AnimCmd sSpriteAnim_8216494[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_82164AC[] = +static const union AnimCmd sAnim_SparkleFull[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(1, 2), @@ -661,44 +714,44 @@ static const union AnimCmd sSpriteAnim_82164AC[] = ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_82164D0[] = +static const union AnimCmd sAnim_GreenArrow[] = { ANIMCMD_FRAME(5, 5, 1, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_82164D8[] = +static const union AnimCmd sAnim_GreenDot[] = { ANIMCMD_FRAME(6, 5, 1, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_82164E0[] = +static const union AnimCmd *const sAnims_Particles[] = { - sSpriteAnim_821647C, - sSpriteAnim_8216494, - sSpriteAnim_82164AC, - sSpriteAnim_82164D0, - sSpriteAnim_82164D8, + sAnim_SparkleCrossToX, // Only this effect is ever used, rest go unused + sAnim_SparkleXToCross, + sAnim_SparkleFull, + sAnim_GreenArrow, + sAnim_GreenDot, }; -static const struct SpriteSheet sUnknown_08339BD8 = +static const struct SpriteSheet sSpriteSheet_Particles = { - gBerryBlenderParticlesTiles, 0xE0, 23456 + gBerryBlenderParticles_Gfx, 0xE0, GFXTAG_PARTICLES }; -static const struct SpriteTemplate sUnknown_08339BE0 = +static const struct SpriteTemplate sSpriteTemplate_Particles = { - .tileTag = 23456, - .paletteTag = 46546, - .oam = &sOamData_8216474, - .anims = sSpriteAnimTable_82164E0, + .tileTag = GFXTAG_PARTICLES, + .paletteTag = PALTAG_MISC, + .oam = &sOam_Particles, + .anims = sAnims_Particles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct OamData sOamData_8216514 = +static const struct OamData sOam_CountdownNumbers = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -715,48 +768,48 @@ static const struct OamData sOamData_8216514 = .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_821651C[] = +static const union AnimCmd sAnim_CountdownNumbers_3[] = { ANIMCMD_FRAME(32, 30), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8216524[] = +static const union AnimCmd sAnim_CountdownNumbers_2[] = { ANIMCMD_FRAME(16, 30), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_821652C[] = +static const union AnimCmd sAnim_CountdownNumbers_1[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8216534[] = +static const union AnimCmd *const sAnims_CountdownNumbers[] = { - sSpriteAnim_821651C, - sSpriteAnim_8216524, - sSpriteAnim_821652C, + sAnim_CountdownNumbers_3, + sAnim_CountdownNumbers_2, + sAnim_CountdownNumbers_1, }; -static const struct SpriteSheet sUnknown_08339C24 = +static const struct SpriteSheet sSpriteSheet_CountdownNumbers = { - gBerryBlenderCountdownNumbersTiles, 0x600, 12345 + gBerryBlenderCountdownNumbers_Gfx, 0x600, GFXTAG_COUNTDOWN_NUMBERS }; -static const struct SpriteTemplate sUnknown_08339C2C = +static const struct SpriteTemplate sSpriteTemplate_CountdownNumbers = { - .tileTag = 12345, - .paletteTag = 46546, - .oam = &sOamData_8216514, - .anims = sSpriteAnimTable_8216534, + .tileTag = GFXTAG_COUNTDOWN_NUMBERS, + .paletteTag = PALTAG_MISC, + .oam = &sOam_CountdownNumbers, + .anims = sAnims_CountdownNumbers, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8083010 + .callback = SpriteCB_CountdownNumber }; -static const struct OamData sOamData_8216560 = +static const struct OamData sOam_Start = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -773,34 +826,36 @@ static const struct OamData sOamData_8216560 = .affineParam = 0, }; -static const union AnimCmd sSpriteAnim_8216568[] = +static const union AnimCmd sAnim_Start[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8216570[] = +static const union AnimCmd *const sAnims_Start[] = { - sSpriteAnim_8216568, + sAnim_Start, }; -static const struct SpriteSheet sUnknown_08339C58 = +static const struct SpriteSheet sSpriteSheet_Start = { - gBerryBlenderStartTiles, 0x400, 12346 + gBerryBlenderStart_Gfx, 0x400, GFXTAG_START }; -static const struct SpriteTemplate sUnknown_08339C60 = +static const struct SpriteTemplate sSpriteTemplate_Start = { - .tileTag = 12346, - .paletteTag = 46546, - .oam = &sOamData_8216560, - .anims = sSpriteAnimTable_8216570, + .tileTag = GFXTAG_START, + .paletteTag = PALTAG_MISC, + .oam = &sOam_Start, + .anims = sAnims_Start, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80830C0 + .callback = SpriteCB_Start }; -static const s16 sUnknown_08339C78[][5] = +// Data for throwing the berries in at the start +// x, y, bounce speed, x speed, y speed +static const s16 sBerrySpriteData[][5] = { {-10, 20, 10, 2, 1}, {250, 20, 10, -2, 1}, @@ -808,18 +863,54 @@ static const s16 sUnknown_08339C78[][5] = {250, 140, 10, -2, -1}, }; -static const u8 sOpponentBerrySets[][3] = +// There are only 5 different berries the NPCs will ever use +// Each of these sets represents 3 berries chosen to be used by the NPCs +// If the player's berry is one of the 5 possible berries, a set is chosen that excludes it +static const u8 sOpponentBerrySets[NUM_NPC_BERRIES * 2][3] = { - {4, 3, 2}, {0, 4, 3}, {1, 0, 4}, {2, 1, 0}, {3, 2, 1}, {0, 2, 3}, {1, 3, 4}, {2, 4, 0}, {3, 0, 1}, {4, 1, 2}, + // These sets are used if the player chose one of the 5 NPC berries + {ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1, ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1}, // player chose Cheri Berry + {ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1, ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1}, // player chose Chesto Berry + {ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1}, // player chose Pecha Berry + {ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1}, // player chose Rawst Berry + {ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1}, // player chose Aspear Berry + + // These sets are used if the player chose a different berry (set is selected by player's berry % 5) + {ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1, ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1}, // player chose Leppa, Figy, ... + {ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1}, // player chose Oran, Wiki, ... + {ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1}, // player chose Persim, Mago, ... + {ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1}, // player chose Lum, Aguav, ... + {ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1}, // player chose Sitrus, Iapapa, ... }; -static const u8 sSpecialOpponentBerrySets[] = {30, 31, 32, 33, 34}; +// Berry master's berries follow the same rules as above, but instead of explicitly listing +// the alternate sets if the player chooses one of these berries, it implicitly uses these berries - 5, i.e. Tamato - Nomel +static const u8 sBerryMasterBerries[] = { + ITEM_TO_BERRY(ITEM_SPELON_BERRY) - 1, + ITEM_TO_BERRY(ITEM_PAMTRE_BERRY) - 1, + ITEM_TO_BERRY(ITEM_WATMEL_BERRY) - 1, + ITEM_TO_BERRY(ITEM_DURIN_BERRY) - 1, + ITEM_TO_BERRY(ITEM_BELUE_BERRY) - 1 +}; -static const u8 sUnknown_08339CC3[] = {1, 1, 2, 3, 4}; +// "0 players" is link +static const u8 sNumPlayersToSpeedDivisor[] = {1, 1, 2, 3, 4}; -static const u8 sUnknown_08339CC8[] = {0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15}; +// Black pokeblocks will use one of these random combinations of flavors +static const u8 sBlackPokeblockFlavorFlags[] = { + (1 << FLAVOR_SOUR) | (1 << FLAVOR_BITTER) | (1 << FLAVOR_SWEET), + (1 << FLAVOR_SOUR) | (1 << FLAVOR_SWEET) | (1 << FLAVOR_DRY), + (1 << FLAVOR_SOUR) | (1 << FLAVOR_DRY) | (1 << FLAVOR_SPICY), + (1 << FLAVOR_SOUR) | (1 << FLAVOR_BITTER) | (1 << FLAVOR_DRY), + (1 << FLAVOR_SOUR) | (1 << FLAVOR_BITTER) | (1 << FLAVOR_SPICY), + (1 << FLAVOR_BITTER) | (1 << FLAVOR_SWEET) | (1 << FLAVOR_DRY), + (1 << FLAVOR_BITTER) | (1 << FLAVOR_SWEET) | (1 << FLAVOR_SPICY), + (1 << FLAVOR_BITTER) | (1 << FLAVOR_DRY) | (1 << FLAVOR_SPICY), + (1 << FLAVOR_SWEET) | (1 << FLAVOR_DRY) | (1 << FLAVOR_SPICY), + (1 << FLAVOR_SOUR) | (1 << FLAVOR_SWEET) | (1 << FLAVOR_SPICY), +}; -static const u8 sUnknown_08339CD2[] = +static const u8 sUnused[] = { 0xfe, 0x02, 0x02, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f, 0x0c, 0x10, 0x00, 0xff, 0xfe, 0x91, 0x72, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f, @@ -840,20 +931,18 @@ static const struct WindowTemplate sBlenderRecordWindowTemplate = .baseBlock = 8 }; -// code - -static void Blender_ControlHitPitch(void) +static void UpdateHitPitch(void) { - m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128)); + m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, 2 * (sBerryBlender->speed - MIN_ARROW_SPEED)); } -static void VBlankCB0_BerryBlender(void) +static void VBlankCB_BerryBlender(void) { - BerryBlender_SetBackgroundsPos(); - SetBgAffine(2, sBerryBlenderData->bgAffineSrc.texX, sBerryBlenderData->bgAffineSrc.texY, - sBerryBlenderData->bgAffineSrc.scrX, sBerryBlenderData->bgAffineSrc.scrY, - sBerryBlenderData->bgAffineSrc.sx, sBerryBlenderData->bgAffineSrc.sy, - sBerryBlenderData->bgAffineSrc.alpha); + SetBgPos(); + SetBgAffine(2, sBerryBlender->bgAffineSrc.texX, sBerryBlender->bgAffineSrc.texY, + sBerryBlender->bgAffineSrc.scrX, sBerryBlender->bgAffineSrc.scrY, + sBerryBlender->bgAffineSrc.sx, sBerryBlender->bgAffineSrc.sy, + sBerryBlender->bgAffineSrc.alpha); LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -861,64 +950,64 @@ static void VBlankCB0_BerryBlender(void) static bool8 LoadBerryBlenderGfx(void) { - switch (sBerryBlenderData->loadGfxState) + switch (sBerryBlender->loadGfxState) { case 0: - sBerryBlenderData->tilesBuffer = AllocZeroed(GetDecompressedDataSize(sBlenderCenterGfx) + 100); - LZDecompressWram(sBlenderCenterGfx, sBerryBlenderData->tilesBuffer); - sBerryBlenderData->loadGfxState++; + sBerryBlender->tilesBuffer = AllocZeroed(GetDecompressedDataSize(gBerryBlenderCenter_Gfx) + 100); + LZDecompressWram(gBerryBlenderCenter_Gfx, sBerryBlender->tilesBuffer); + sBerryBlender->loadGfxState++; break; case 1: - CopyToBgTilemapBuffer(2, sBlenderCenterMap, 0x400, 0); + CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0); CopyBgTilemapBufferToVram(2); - LoadPalette(sBlenderCenterPal, 0, 0x100); - sBerryBlenderData->loadGfxState++; + LoadPalette(sBlenderCenter_Pal, 0, 0x100); + sBerryBlender->loadGfxState++; break; case 2: - LoadBgTiles(2, sBerryBlenderData->tilesBuffer, GetDecompressedDataSize(sBlenderCenterGfx), 0); - sBerryBlenderData->loadGfxState++; + LoadBgTiles(2, sBerryBlender->tilesBuffer, GetDecompressedDataSize(gBerryBlenderCenter_Gfx), 0); + sBerryBlender->loadGfxState++; break; case 3: - LZDecompressWram(gUnknown_08D91DB8, sBerryBlenderData->tilesBuffer); - sBerryBlenderData->loadGfxState++; + LZDecompressWram(gBerryBlenderOuter_Gfx, sBerryBlender->tilesBuffer); + sBerryBlender->loadGfxState++; break; case 4: - LoadBgTiles(1, sBerryBlenderData->tilesBuffer, GetDecompressedDataSize(gUnknown_08D91DB8), 0); - sBerryBlenderData->loadGfxState++; + LoadBgTiles(1, sBerryBlender->tilesBuffer, GetDecompressedDataSize(gBerryBlenderOuter_Gfx), 0); + sBerryBlender->loadGfxState++; break; case 5: - LZDecompressWram(gUnknown_08D927EC, sBerryBlenderData->tilesBuffer); - sBerryBlenderData->loadGfxState++; + LZDecompressWram(gBerryBlenderOuter_Tilemap, sBerryBlender->tilesBuffer); + sBerryBlender->loadGfxState++; break; case 6: - CopyToBgTilemapBuffer(1, sBerryBlenderData->tilesBuffer, GetDecompressedDataSize(gUnknown_08D927EC), 0); + CopyToBgTilemapBuffer(1, sBerryBlender->tilesBuffer, GetDecompressedDataSize(gBerryBlenderOuter_Tilemap), 0); CopyBgTilemapBufferToVram(1); - sBerryBlenderData->loadGfxState++; + sBerryBlender->loadGfxState++; break; case 7: - LoadPalette(sBlenderOuterPal, 0x80, 0x20); - sBerryBlenderData->loadGfxState++; + LoadPalette(sBlenderOuter_Pal, 0x80, 0x20); + sBerryBlender->loadGfxState++; break; case 8: - LoadSpriteSheet(&sSpriteSheet_BlenderArrow); - LoadSpriteSheet(&sUnknown_08339BD8); - LoadSpriteSheet(&sUnknown_08339B38); - sBerryBlenderData->loadGfxState++; + LoadSpriteSheet(&sSpriteSheet_PlayerArrow); + LoadSpriteSheet(&sSpriteSheet_Particles); + LoadSpriteSheet(&sSpriteSheet_ScoreSymbols); + sBerryBlender->loadGfxState++; break; case 9: - LoadSpriteSheet(&sUnknown_08339C24); - LoadSpriteSheet(&sUnknown_08339C58); - LoadSpritePalette(&sSpritePal_BlenderArrow); + LoadSpriteSheet(&sSpriteSheet_CountdownNumbers); + LoadSpriteSheet(&sSpriteSheet_Start); + LoadSpritePalette(&sSpritePal_PlayerArrow); LoadSpritePalette(&sSpritePal_BlenderMisc); - Free(sBerryBlenderData->tilesBuffer); - sBerryBlenderData->loadGfxState = 0; + Free(sBerryBlender->tilesBuffer); + sBerryBlender->loadGfxState = 0; return TRUE; } return FALSE; } -static void sub_807F9D0(void) +static void DrawBlenderBg(void) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); CopyBgTilemapBufferToVram(0); @@ -933,7 +1022,7 @@ static void sub_807F9D0(void) static void InitBerryBlenderWindows(void) { - if (InitWindows(sBerryBlender_WindowTemplates)) + if (InitWindows(sWindowTemplates)) { s32 i; @@ -946,24 +1035,27 @@ static void InitBerryBlenderWindows(void) } } +// gSpecialVar_0x8004 is the number of NPC opponents +// Set to 0 indicates it's a link blender void DoBerryBlending(void) { - if (sBerryBlenderData == NULL) - sBerryBlenderData = AllocZeroed(sizeof(*sBerryBlenderData)); + if (sBerryBlender == NULL) + sBerryBlender = AllocZeroed(sizeof(*sBerryBlender)); - sBerryBlenderData->gameEndState = 0; - sBerryBlenderData->mainState = 0; - sBerryBlenderData->gameEndState = 0; + sBerryBlender->gameEndState = 0; + sBerryBlender->mainState = 0; + sBerryBlender->gameEndState = 0; - Blender_SetPlayerNamesLocal(gSpecialVar_0x8004); - SetMainCallback2(sub_807FAC8); + InitLocalPlayers(gSpecialVar_0x8004); + SetMainCallback2(CB2_LoadBerryBlender); } -static void sub_807FAC8(void) +// Show the blender screen initially and prompt to choose a berry +static void CB2_LoadBerryBlender(void) { s32 i; - switch (sBerryBlenderData->mainState) + switch (sBerryBlender->mainState) { case 0: SetGpuReg(REG_OFFSET_DISPCNT, 0); @@ -971,68 +1063,69 @@ static void sub_807FAC8(void) FreeAllSpritePalettes(); SetVBlankCallback(NULL); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); - SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); - SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); + InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates)); + SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); + SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); LoadUserWindowBorderGfx(0, 1, 0xD0); LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); - sBerryBlenderData->mainState++; - sBerryBlenderData->field_118 = 0; - sBerryBlenderData->field_116 = 0; - sBerryBlenderData->field_11A = 0x50; - sBerryBlenderData->bg_X = 0; - sBerryBlenderData->bg_Y = 0; - sBerryBlenderData->loadGfxState = 0; + sBerryBlender->mainState++; + sBerryBlender->maxProgressBarValue = 0; + sBerryBlender->progressBarValue = 0; + sBerryBlender->centerScale = 80; + sBerryBlender->bg_X = 0; + sBerryBlender->bg_Y = 0; + sBerryBlender->loadGfxState = 0; - sub_8082D28(); + UpdateBlenderCenter(); break; case 1: if (LoadBerryBlenderGfx()) { for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->syncArrowSpriteIds[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1); - StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[i]], i + 8); + sBerryBlender->playerArrowSpriteIds[i] = CreateSprite(&sSpriteTemplate_PlayerArrow, sPlayerArrowPos[i][0], sPlayerArrowPos[i][1], 1); + StartSpriteAnim(&gSprites[sBerryBlender->playerArrowSpriteIds[i]], i + 8); } - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) + if (gReceivedRemoteLinkPlayers && gWirelessCommType) { LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); } - SetVBlankCallback(VBlankCB0_BerryBlender); - sBerryBlenderData->mainState++; + SetVBlankCallback(VBlankCB_BerryBlender); + sBerryBlender->mainState++; } break; case 2: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - sub_8082D28(); - sBerryBlenderData->mainState++; + UpdateBlenderCenter(); + sBerryBlender->mainState++; break; case 3: - sub_807F9D0(); + DrawBlenderBg(); if (!gPaletteFade.active) - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 4: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_BerryBlenderStart, GetPlayerTextSpeedDelay())) - sBerryBlenderData->mainState++; + if (Blender_PrintText(&sBerryBlender->textState, sText_BerryBlenderStart, GetPlayerTextSpeedDelay())) + sBerryBlender->mainState++; break; case 5: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 6: if (!gPaletteFade.active) { + // Go to bag menu to choose berry, set callback to StartBlender FreeAllWindowBuffers(); UnsetBgTilemapBuffer(2); UnsetBgTilemapBuffer(1); SetVBlankCallback(NULL); - ChooseBerrySetCallback(sub_807FFA4); + ChooseBerryForMachine(StartBlender); - sBerryBlenderData->mainState = 0; + sBerryBlender->mainState = 0; } break; } @@ -1043,47 +1136,71 @@ static void sub_807FAC8(void) UpdatePaletteFade(); } -static void sub_807FD08(struct Sprite* sprite) +#define sTargetY data[0] +#define sX data[1] +#define sY data[2] +#define sBounceSpeed data[3] +#define sYUpSpeed data[4] +#define sBounces data[5] +#define sXSpeed data[6] +#define sYDownSpeed data[7] + +// For throwing berries into the machine +static void SpriteCB_Berry(struct Sprite* sprite) { - sprite->data[1] += sprite->data[6]; - sprite->data[2] -= sprite->data[4]; - sprite->data[2] += sprite->data[7]; - sprite->data[0] += sprite->data[7]; - sprite->data[4]--; + sprite->sX += sprite->sXSpeed; + sprite->sY -= sprite->sYUpSpeed; + sprite->sY += sprite->sYDownSpeed; + sprite->sTargetY += sprite->sYDownSpeed; + sprite->sYUpSpeed--; - if (sprite->data[0] < sprite->data[2]) + if (sprite->sTargetY < sprite->sY) { - sprite->data[3] = sprite->data[4] = sprite->data[3] - 1; + sprite->sBounceSpeed = sprite->sYUpSpeed = sprite->sBounceSpeed - 1; - if (++sprite->data[5] > 3) + if (++sprite->sBounces > 3) DestroySprite(sprite); else - PlaySE(SE_TB_KARA); + PlaySE(SE_BALL_TRAY_EXIT); } - sprite->pos1.x = sprite->data[1]; - sprite->pos1.y = sprite->data[2]; + sprite->pos1.x = sprite->sX; + sprite->pos1.y = sprite->sY; } -static void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) +static void SetBerrySpriteData(struct Sprite* sprite, s16 x, s16 y, s16 bounceSpeed, s16 xSpeed, s16 ySpeed) { - sprite->data[0] = a3; - sprite->data[1] = a2; - sprite->data[2] = a3; - sprite->data[3] = a4; - sprite->data[4] = 10; - sprite->data[5] = 0; - sprite->data[6] = a5; - sprite->data[7] = a6; - sprite->callback = sub_807FD08; + sprite->sTargetY = y; + sprite->sX = x; + sprite->sY = y; + sprite->sBounceSpeed = bounceSpeed; + sprite->sYUpSpeed = 10; + sprite->sBounces = 0; + sprite->sXSpeed = xSpeed; + sprite->sYDownSpeed = ySpeed; + sprite->callback = SpriteCB_Berry; } -static void sub_807FD90(u16 a0, u8 a1) +#undef sTargetY +#undef sX +#undef sY +#undef sBounceSpeed +#undef sYUpSpeed +#undef sBounces +#undef sXSpeed +#undef sYDownSpeed + +static void CreateBerrySprite(u16 a0, u8 playerId) { - u8 spriteId = LoadSpinningBerryPicGfx(a0 + 123, 0, 80, a1 & 1); - sub_807FD64(&gSprites[spriteId], sUnknown_08339C78[a1][0], sUnknown_08339C78[a1][1], sUnknown_08339C78[a1][2], sUnknown_08339C78[a1][3], sUnknown_08339C78[a1][4]); + u8 spriteId = CreateSpinningBerrySprite(a0 + FIRST_BERRY_INDEX - 10, 0, 80, playerId & 1); + SetBerrySpriteData(&gSprites[spriteId], + sBerrySpriteData[playerId][0], + sBerrySpriteData[playerId][1], + sBerrySpriteData[playerId][2], + sBerrySpriteData[playerId][3], + sBerrySpriteData[playerId][4]); } -static void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId) +static void ConvertItemToBlenderBerry(struct BlenderBerry* berry, u16 itemId) { const struct Berry *berryInfo = GetBerryInfo(ITEM_TO_BERRY(itemId)); @@ -1094,19 +1211,19 @@ static void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId) berry->flavors[FLAVOR_SWEET] = berryInfo->sweet; berry->flavors[FLAVOR_BITTER] = berryInfo->bitter; berry->flavors[FLAVOR_SOUR] = berryInfo->sour; - berry->smoothness = berryInfo->smoothness; + berry->flavors[FLAVOR_COUNT] = berryInfo->smoothness; } -static void Blender_SetPlayerNamesLocal(u8 opponentsNum) +static void InitLocalPlayers(u8 opponentsNum) { switch (opponentsNum) { - case 0: + case 0: // Link games have 0 in-game opponents gInGameOpponentsNo = 0; break; case 1: gInGameOpponentsNo = 1; - sBerryBlenderData->playersNo = 2; + sBerryBlender->numPlayers = 2; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER)) @@ -1119,7 +1236,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) break; case 2: gInGameOpponentsNo = 2; - sBerryBlenderData->playersNo = 3; + sBerryBlender->numPlayers = 3; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_DUDE]); StringCopy(gLinkPlayers[2].name, sBlenderOpponentsNames[BLENDER_LASSIE]); @@ -1130,7 +1247,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) break; case 3: gInGameOpponentsNo = 3; - sBerryBlenderData->playersNo = 4; + sBerryBlender->numPlayers = 4; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISS]); StringCopy(gLinkPlayers[2].name, sBlenderOpponentsNames[BLENDER_LADDIE]); @@ -1144,94 +1261,95 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) } } -static void sub_807FFA4(void) +static void StartBlender(void) { s32 i; SetGpuReg(REG_OFFSET_DISPCNT, 0); - if (sBerryBlenderData == NULL) - sBerryBlenderData = AllocZeroed(sizeof(*sBerryBlenderData)); + if (sBerryBlender == NULL) + sBerryBlender = AllocZeroed(sizeof(*sBerryBlender)); - sBerryBlenderData->mainState = 0; - sBerryBlenderData->field_10C = 0; + sBerryBlender->mainState = 0; + sBerryBlender->unk1 = 0; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) - sBerryBlenderData->chosenItemId[i] = ITEM_NONE; + sBerryBlender->chosenItemId[i] = ITEM_NONE; - Blender_SetPlayerNamesLocal(gSpecialVar_0x8004); + InitLocalPlayers(gSpecialVar_0x8004); if (gSpecialVar_0x8004 == 0) - SetMainCallback2(sub_8080018); + SetMainCallback2(CB2_StartBlenderLink); else - SetMainCallback2(sub_80808D4); + SetMainCallback2(CB2_StartBlenderLocal); } -static void sub_8080018(void) +static void CB2_StartBlenderLink(void) { s32 i, j; - switch (sBerryBlenderData->mainState) + switch (sBerryBlender->mainState) { case 0: - sub_8080588(); + InitBlenderBgs(); gLinkType = LINKTYPE_BERRY_BLENDER; - sBerryBlenderData->field_72 = 0; + sBerryBlender->slowdownTimer = 0; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_64[i] = 0; - for (j = 0; j < 3; j++) + sBerryBlender->playerContinueResponses[i] = 0; + for (j = 0; j < NUM_SCORE_TYPES; j++) { - sBerryBlenderData->scores[i][j] = 0; + sBerryBlender->scores[i][j] = 0; } } - sBerryBlenderData->playAgainState = 0; - sBerryBlenderData->max_RPM = 0; - sBerryBlenderData->loadGfxState = 0; - sBerryBlenderData->mainState++; + sBerryBlender->playAgainState = 0; + sBerryBlender->maxRPM = 0; + sBerryBlender->loadGfxState = 0; + sBerryBlender->mainState++; break; case 1: if (LoadBerryBlenderGfx()) { - sBerryBlenderData->mainState++; - sub_8082D28(); + sBerryBlender->mainState++; + UpdateBlenderCenter(); } break; case 2: for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->syncArrowSprite2Ids[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1); - StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSprite2Ids[i]], i + 8); + sBerryBlender->playerArrowSpriteIds2[i] = CreateSprite(&sSpriteTemplate_PlayerArrow, sPlayerArrowPos[i][0], sPlayerArrowPos[i][1], 1); + StartSpriteAnim(&gSprites[sBerryBlender->playerArrowSpriteIds2[i]], i + 8); } - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) + if (gReceivedRemoteLinkPlayers && gWirelessCommType) { LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); } - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 3: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 4: - sub_807F9D0(); + DrawBlenderBg(); if (!gPaletteFade.active) { - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; } break; case 5: - Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, 0); - sBerryBlenderData->mainState = 8; - sBerryBlenderData->framesToWait = 0; + Blender_PrintText(&sBerryBlender->textState, sText_CommunicationStandby, 0); + sBerryBlender->mainState = 8; + sBerryBlender->framesToWait = 0; break; case 8: - sBerryBlenderData->mainState++; - sBerryBlenderData->field_114 = 0; - Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId); - memcpy(gBlockSendBuffer, &sBerryBlenderData->blendedBerries[0], sizeof(struct BlenderBerry)); + // Send berry choice to link partners + sBerryBlender->mainState++; + sBerryBlender->playerToThrowBerry = 0; + ConvertItemToBlenderBerry(&sBerryBlender->blendedBerries[0], gSpecialVar_ItemId); + memcpy(gBlockSendBuffer, &sBerryBlender->blendedBerries[0], sizeof(struct BlenderBerry)); SetLinkStandbyCallback(); - sBerryBlenderData->framesToWait = 0; + sBerryBlender->framesToWait = 0; break; case 9: if (IsLinkTaskFinished()) @@ -1239,122 +1357,130 @@ static void sub_8080018(void) ResetBlockReceivedFlags(); if (GetMultiplayerId() == 0) SendBlockRequest(4); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; } break; case 10: - if (++sBerryBlenderData->framesToWait > 20) + if (++sBerryBlender->framesToWait > 20) { + // Wait for partners' berries ClearDialogWindowAndFrameToTransparent(4, TRUE); if (GetBlockReceivedStatus() == GetLinkPlayerCountAsBitFlags()) { for (i = 0; i < GetLinkPlayerCount(); i++) { - memcpy(&sBerryBlenderData->blendedBerries[i], &gBlockRecvBuffer[i][0], sizeof(struct BlenderBerry)); - sBerryBlenderData->chosenItemId[i] = sBerryBlenderData->blendedBerries[i].itemId; + memcpy(&sBerryBlender->blendedBerries[i], &gBlockRecvBuffer[i][0], sizeof(struct BlenderBerry)); + sBerryBlender->chosenItemId[i] = sBerryBlender->blendedBerries[i].itemId; } ResetBlockReceivedFlags(); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; } } break; case 11: - sBerryBlenderData->playersNo = GetLinkPlayerCount(); + sBerryBlender->numPlayers = GetLinkPlayerCount(); + // Throw 1 player's berry in for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_114 == sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]) + if (sBerryBlender->playerToThrowBerry == sPlayerIdMap[sBerryBlender->numPlayers - 2][i]) { - sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i); + CreateBerrySprite(sBerryBlender->chosenItemId[sBerryBlender->playerToThrowBerry], i); break; } } - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; - sBerryBlenderData->field_114++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; + sBerryBlender->playerToThrowBerry++; break; case 12: - if (++sBerryBlenderData->framesToWait > 60) + if (++sBerryBlender->framesToWait > 60) { - if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo) + if (sBerryBlender->playerToThrowBerry >= sBerryBlender->numPlayers) { - sBerryBlenderData->mainState++; - sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528; + // Finished throwing berries in + sBerryBlender->mainState++; + sBerryBlender->arrowPos = sArrowStartPos[sArrowStartPosIds[sBerryBlender->numPlayers - 2]] - ARROW_FALL_ROTATION; } else { - sBerryBlenderData->mainState--; + // Haven't finished throwing berries in, go back to prev step + sBerryBlender->mainState--; } - sBerryBlenderData->framesToWait = 0; + sBerryBlender->framesToWait = 0; } break; case 13: if (IsLinkTaskFinished()) { - sBerryBlenderData->mainState++; - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); - PlaySE(SE_RU_HYUU); + sBerryBlender->mainState++; + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); + PlaySE(SE_FALL); ShowBg(2); } break; case 14: SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); - sBerryBlenderData->arrowPos += 0x200; - sBerryBlenderData->field_11A += 4; - if (sBerryBlenderData->field_11A > 0xFF) + sBerryBlender->arrowPos += 0x200; + sBerryBlender->centerScale += 4; + if (sBerryBlender->centerScale > 255) { SetGpuRegBits(REG_OFFSET_BG2CNT, 2); - sBerryBlenderData->mainState++; - sBerryBlenderData->field_11A = 0x100; - sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]]; - sBerryBlenderData->framesToWait = 0; - PlaySE(SE_TRACK_DOOR); - sub_808074C(); - Blender_PrintPlayerNames(); + sBerryBlender->mainState++; + sBerryBlender->centerScale = 256; + sBerryBlender->arrowPos = sArrowStartPos[sArrowStartPosIds[sBerryBlender->numPlayers - 2]]; + sBerryBlender->framesToWait = 0; + PlaySE(SE_TRUCK_DOOR); + SetPlayerIdMaps(); + PrintPlayerNames(); } - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); break; case 15: - if (sub_8083380()) + if (UpdateBlenderLandScreenShake()) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; } - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); break; case 16: - CreateSprite(&sUnknown_08339C2C, 120, -16, 3); - sBerryBlenderData->mainState++; + CreateSprite(&sSpriteTemplate_CountdownNumbers, 120, -16, 3); + sBerryBlender->mainState++; + break; + case 17: + // Wait here for the countdown + // State is progressed in SpriteCB_Start break; case 18: - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 19: SetLinkStandbyCallback(); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 20: if (IsLinkTaskFinished()) { - sub_800A418(); - sBerryBlenderData->mainState++; + SetBerryBlenderLinkCallback(); + sBerryBlender->mainState++; } break; case 21: - sBerryBlenderData->field_4C = 128; - sBerryBlenderData->gameFrameTime = 0; - SetMainCallback2(sub_8081898); + sBerryBlender->speed = MIN_ARROW_SPEED; + sBerryBlender->gameFrameTime = 0; + SetMainCallback2(CB2_PlayBlender); if (GetCurrentMapMusic() != MUS_CYCLING) { - sBerryBlenderData->field_154 = GetCurrentMapMusic(); + sBerryBlender->savedMusic = GetCurrentMapMusic(); } PlayBGM(MUS_CYCLING); break; } - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -1362,7 +1488,7 @@ static void sub_8080018(void) UpdatePaletteFade(); } -static void sub_8080588(void) +static void InitBlenderBgs(void) { SetGpuReg(REG_OFFSET_DISPCNT, 0); @@ -1370,47 +1496,47 @@ static void sub_8080588(void) FreeAllSpritePalettes(); ResetTasks(); - SetVBlankCallback(VBlankCB0_BerryBlender); + SetVBlankCallback(VBlankCB_BerryBlender); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); + InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates)); - SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); - SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); + SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]); + SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]); LoadUserWindowBorderGfx(0, 1, 0xD0); LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); - sBerryBlenderData->field_44 = 0; - sBerryBlenderData->field_4C = 0; - sBerryBlenderData->arrowPos = 0; - sBerryBlenderData->max_RPM = 0; - sBerryBlenderData->bg_X = 0; - sBerryBlenderData->bg_Y = 0; + sBerryBlender->unk0 = 0; + sBerryBlender->speed = 0; + sBerryBlender->arrowPos = 0; + sBerryBlender->maxRPM = 0; + sBerryBlender->bg_X = 0; + sBerryBlender->bg_Y = 0; } -static u8 sub_8080624(u16 arrowPos, u8 playerId) +static u8 GetArrowProximity(u16 arrowPos, u8 playerId) { - u32 var1 = (arrowPos / 0x100) + 0x18; - u8 arrID = sBerryBlenderData->field_96[playerId]; - u32 var2 = sUnknown_083399E7[arrID]; + u32 pos = (arrowPos / 256) + 24; + u8 arrowId = sBerryBlender->playerIdToArrowId[playerId]; + u32 hitRangeStart = sArrowHitRangeStart[arrowId]; - if (var1 >= var2 && var1 < var2 + 0x30) + if (pos >= hitRangeStart && pos < hitRangeStart + 48) { - if (var1 >= var2 + 20 && var1 < var2 + 28) - return 2; + if (pos >= hitRangeStart + 20 && pos < hitRangeStart + 28) + return PROXIMITY_BEST; else - return 1; + return PROXIMITY_GOOD; } - return 0; + return PROXIMITY_MISS; } -static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct BlenderBerry* playerBerry) +static void SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct BlenderBerry* playerBerry) { u16 opponentSetId = 0; u16 opponentBerryId; - u16 var; + u16 berryMasterDiff; u16 i; if (playerBerryItemId == ITEM_ENIGMA_BERRY) @@ -1420,70 +1546,73 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, if (playerBerry->flavors[opponentSetId] > playerBerry->flavors[i]) opponentSetId = i; } - opponentSetId += 5; + opponentSetId += NUM_NPC_BERRIES; } else { - opponentSetId = playerBerryItemId - FIRST_BERRY_INDEX; - if (opponentSetId >= 5) - opponentSetId = (opponentSetId % 5) + 5; + opponentSetId = ITEM_TO_BERRY(playerBerryItemId) - 1; + if (opponentSetId >= NUM_NPC_BERRIES) + opponentSetId = (opponentSetId % NUM_NPC_BERRIES) + NUM_NPC_BERRIES; } for (i = 0; i < playersNum - 1; i++) { opponentBerryId = sOpponentBerrySets[opponentSetId][i]; - var = playerBerryItemId - 163; + berryMasterDiff = ITEM_TO_BERRY(playerBerryItemId) - ITEM_TO_BERRY(ITEM_SPELON_BERRY); if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER) && gSpecialVar_0x8004 == 1) { - opponentSetId %= 5; - opponentBerryId = sSpecialOpponentBerrySets[opponentSetId]; - if (var <= 4) - opponentBerryId -= 5; + opponentSetId %= ARRAY_COUNT(sBerryMasterBerries); + opponentBerryId = sBerryMasterBerries[opponentSetId]; + + // If the player's berry is any of the Berry Master's berries, + // then use the next lower set of berries + if (berryMasterDiff < ARRAY_COUNT(sBerryMasterBerries)) + opponentBerryId -= ARRAY_COUNT(sBerryMasterBerries); } - Blender_SetParticipantBerryData(i + 1, opponentBerryId + FIRST_BERRY_INDEX); + SetPlayerBerryData(i + 1, opponentBerryId + FIRST_BERRY_INDEX); } } -static void sub_808074C(void) +static void SetPlayerIdMaps(void) { s32 i, j; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_96[i] = 0xFF; - sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; + sBerryBlender->playerIdToArrowId[i] = NO_PLAYER; + sBerryBlender->arrowIdToPlayerId[i] = sPlayerIdMap[sBerryBlender->numPlayers - 2][i]; } for (j = 0; j < BLENDER_MAX_PLAYERS; j++) { for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] == j) - sBerryBlenderData->field_96[j] = i; + if (sBerryBlender->arrowIdToPlayerId[i] == j) + sBerryBlender->playerIdToArrowId[j] = i; } } } -static void Blender_PrintPlayerNames(void) +static void PrintPlayerNames(void) { s32 i, xPos; - u32 multiplayerId = 0; + u32 playerId = 0; u8 text[20]; if (gReceivedRemoteLinkPlayers) - multiplayerId = GetMultiplayerId(); + playerId = GetMultiplayerId(); for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlender->arrowIdToPlayerId[i] != NO_PLAYER) { - sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i]; - StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i); + sBerryBlender->playerArrowSpriteIds[sBerryBlender->arrowIdToPlayerId[i]] = sBerryBlender->playerArrowSpriteIds2[i]; + StartSpriteAnim(&gSprites[sBerryBlender->playerArrowSpriteIds[sBerryBlender->arrowIdToPlayerId[i]]], i); text[0] = EOS; - StringCopy(text, gLinkPlayers[sBerryBlenderData->field_8E[i]].name); + StringCopy(text, gLinkPlayers[sBerryBlender->arrowIdToPlayerId[i]].name); xPos = GetStringCenterAlignXOffset(1, text, 0x38); - if (multiplayerId == sBerryBlenderData->field_8E[i]) - Blender_AddTextPrinter(i, text, xPos, 1, 0, 2); + if (playerId == sBerryBlender->arrowIdToPlayerId[i]) + Blender_AddTextPrinter(i, text, xPos, 1, 0, 2); // Highlight player's name in red else Blender_AddTextPrinter(i, text, xPos, 1, 0, 1); @@ -1493,167 +1622,174 @@ static void Blender_PrintPlayerNames(void) } } -static void sub_80808D4(void) +static void CB2_StartBlenderLocal(void) { s32 i, j; - switch (sBerryBlenderData->mainState) + switch (sBerryBlender->mainState) { case 0: SetWirelessCommType0(); - sub_8080588(); - Blender_SetParticipantBerryData(0, gSpecialVar_ItemId); - Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId); - Blender_SetOpponentsBerryData(gSpecialVar_ItemId, sBerryBlenderData->playersNo, &sBerryBlenderData->blendedBerries[0]); + InitBlenderBgs(); + SetPlayerBerryData(0, gSpecialVar_ItemId); + ConvertItemToBlenderBerry(&sBerryBlender->blendedBerries[0], gSpecialVar_ItemId); + SetOpponentsBerryData(gSpecialVar_ItemId, sBerryBlender->numPlayers, &sBerryBlender->blendedBerries[0]); for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_64[i] = 0; - for (j = 0; j < 3; j++) + sBerryBlender->playerContinueResponses[i] = 0; + for (j = 0; j < NUM_SCORE_TYPES; j++) { - sBerryBlenderData->scores[i][j] = 0; + sBerryBlender->scores[i][j] = 0; } } - sBerryBlenderData->playAgainState = 0; - sBerryBlenderData->loadGfxState = 0; + sBerryBlender->playAgainState = 0; + sBerryBlender->loadGfxState = 0; gLinkType = LINKTYPE_BERRY_BLENDER; - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 1: if (LoadBerryBlenderGfx()) { - sBerryBlenderData->mainState++; - sub_8082D28(); + sBerryBlender->mainState++; + UpdateBlenderCenter(); } break; case 2: for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->syncArrowSprite2Ids[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1); - StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSprite2Ids[i]], i + 8); + sBerryBlender->playerArrowSpriteIds2[i] = CreateSprite(&sSpriteTemplate_PlayerArrow, sPlayerArrowPos[i][0], sPlayerArrowPos[i][1], 1); + StartSpriteAnim(&gSprites[sBerryBlender->playerArrowSpriteIds2[i]], i + 8); } - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 3: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - sBerryBlenderData->mainState++; - sBerryBlenderData->framesToWait = 0; + sBerryBlender->mainState++; + sBerryBlender->framesToWait = 0; break; case 4: - if (++sBerryBlenderData->framesToWait == 2) - sub_807F9D0(); + if (++sBerryBlender->framesToWait == 2) + DrawBlenderBg(); if (!gPaletteFade.active) - sBerryBlenderData->mainState = 8; + sBerryBlender->mainState = 8; break; case 8: - sBerryBlenderData->mainState = 11; - sBerryBlenderData->field_114 = 0; + sBerryBlender->mainState = 11; + sBerryBlender->playerToThrowBerry = 0; break; case 11: for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - u32 var = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; - if (sBerryBlenderData->field_114 == var) + // Throw 1 player's berry in + u32 playerId = sPlayerIdMap[sBerryBlender->numPlayers - 2][i]; + if (sBerryBlender->playerToThrowBerry == playerId) { - sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i); + CreateBerrySprite(sBerryBlender->chosenItemId[sBerryBlender->playerToThrowBerry], i); break; } } - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; - sBerryBlenderData->field_114++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; + sBerryBlender->playerToThrowBerry++; break; case 12: - if (++sBerryBlenderData->framesToWait > 60) + if (++sBerryBlender->framesToWait > 60) { - if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo) + if (sBerryBlender->playerToThrowBerry >= sBerryBlender->numPlayers) { - sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528; - sBerryBlenderData->mainState++; + // Finished throwing berries in + sBerryBlender->arrowPos = sArrowStartPos[sArrowStartPosIds[sBerryBlender->numPlayers - 2]] - ARROW_FALL_ROTATION; + sBerryBlender->mainState++; } else { - sBerryBlenderData->mainState--; + // Haven't finished throwing berries in, go back to prev step + sBerryBlender->mainState--; } - sBerryBlenderData->framesToWait = 0; + sBerryBlender->framesToWait = 0; } break; case 13: - sBerryBlenderData->mainState++; - sub_808074C(); - PlaySE(SE_RU_HYUU); - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + sBerryBlender->mainState++; + SetPlayerIdMaps(); + PlaySE(SE_FALL); + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); ShowBg(2); break; case 14: SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); - sBerryBlenderData->arrowPos += 0x200; - sBerryBlenderData->field_11A += 4; - if (sBerryBlenderData->field_11A > 0xFF) + sBerryBlender->arrowPos += 0x200; + sBerryBlender->centerScale += 4; + if (sBerryBlender->centerScale > 255) { - sBerryBlenderData->mainState++; - sBerryBlenderData->field_11A = 0x100; - sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]]; + sBerryBlender->mainState++; + sBerryBlender->centerScale = 256; + sBerryBlender->arrowPos = sArrowStartPos[sArrowStartPosIds[sBerryBlender->numPlayers - 2]]; SetGpuRegBits(REG_OFFSET_BG2CNT, 2); - sBerryBlenderData->framesToWait = 0; - PlaySE(SE_TRACK_DOOR); - Blender_PrintPlayerNames(); + sBerryBlender->framesToWait = 0; + PlaySE(SE_TRUCK_DOOR); + PrintPlayerNames(); } - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); break; case 15: - if (sub_8083380()) + if (UpdateBlenderLandScreenShake()) { - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; } - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); break; case 16: - CreateSprite(&sUnknown_08339C2C, 120, -16, 3); - sBerryBlenderData->mainState++; + CreateSprite(&sSpriteTemplate_CountdownNumbers, 120, -16, 3); + sBerryBlender->mainState++; + break; + case 17: + // Wait here for the countdown + // State is progressed in SpriteCB_Start break; case 18: - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 19: - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 20: - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; break; case 21: - sub_8080DF8(); - sBerryBlenderData->field_4C = 0x80; - sBerryBlenderData->gameFrameTime = 0; - sBerryBlenderData->field_123 = 0; - sBerryBlenderData->field_72 = 0; - SetMainCallback2(sub_8081898); + ResetLinkCmds(); + sBerryBlender->speed = MIN_ARROW_SPEED; + sBerryBlender->gameFrameTime = 0; + sBerryBlender->perfectOpponents = FALSE; + sBerryBlender->slowdownTimer = 0; + SetMainCallback2(CB2_PlayBlender); if (gSpecialVar_0x8004 == 1) { if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER)) - sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10); + sBerryBlender->opponentTaskIds[0] = CreateTask(Task_HandleBerryMaster, 10); else - sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10); + sBerryBlender->opponentTaskIds[0] = CreateTask(sLocalOpponentTasks[0], 10); } if (gSpecialVar_0x8004 > 1) { for (i = 0; i < gSpecialVar_0x8004; i++) - sBerryBlenderData->field_120[i] = CreateTask(sUnknown_083399EC[i], 10 + i); + sBerryBlender->opponentTaskIds[i] = CreateTask(sLocalOpponentTasks[i], 10 + i); } if (GetCurrentMapMusic() != MUS_CYCLING) - sBerryBlenderData->field_154 = GetCurrentMapMusic(); + sBerryBlender->savedMusic = GetCurrentMapMusic(); PlayBGM(MUS_CYCLING); - PlaySE(SE_MOTER); - Blender_ControlHitPitch(); + PlaySE(SE_BERRY_BLENDER); + UpdateHitPitch(); break; } - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -1661,410 +1797,433 @@ static void sub_80808D4(void) UpdatePaletteFade(); } -static void sub_8080DF8(void) +static void ResetLinkCmds(void) { s32 i; - for (i = 0; i < CMD_LENGTH / 2; i++) + for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - gSendCmd[0] = 0; - gSendCmd[2] = 0; - gRecvCmds[i][0] = 0; - gRecvCmds[i][2] = 0; + gSendCmd[BLENDER_COMM_INPUT_STATE] = 0; + gSendCmd[BLENDER_COMM_SCORE] = 0; + gRecvCmds[i][BLENDER_COMM_INPUT_STATE] = 0; + gRecvCmds[i][BLENDER_COMM_SCORE] = 0; } } -static void sub_8080E20(u8 taskId) +#define tTimer data[0] +#define tDelay data[1] +#define tPlayerId data[2] + +static void Task_OpponentMiss(u8 taskId) { - if(++gTasks[taskId].data[0] > gTasks[taskId].data[1]) + if(++gTasks[taskId].tTimer > gTasks[taskId].tDelay) { - gRecvCmds[gTasks[taskId].data[2]][2] = 0x2345; + gRecvCmds[gTasks[taskId].tPlayerId][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_MISS; DestroyTask(taskId); } } -static void sub_8080E6C(u8 a0, u8 a1) +static void CreateOpponentMissTask(u8 playerId, u8 delay) { - u8 taskId = CreateTask(sub_8080E20, 80); - gTasks[taskId].data[1] = a1; - gTasks[taskId].data[2] = a0; + u8 taskId = CreateTask(Task_OpponentMiss, 80); + gTasks[taskId].tDelay = delay; + gTasks[taskId].tPlayerId = playerId; } -static void sub_8080EA4(u8 taskId) +#undef tTimer +#undef tDelay +#undef tPlayerId + +#define tDidInput data[0] + +static void Task_HandleOpponent1(u8 taskId) { - if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2) + if (GetArrowProximity(sBerryBlender->arrowPos, 1) == PROXIMITY_BEST) { - if (gTasks[taskId].data[0] == 0) + if (!gTasks[taskId].tDidInput) { - if (sBerryBlenderData->field_123 == 0) + if (!sBerryBlender->perfectOpponents) { u8 rand = Random() / 655; - if (sBerryBlenderData->field_4C < 500) + if (sBerryBlender->speed < 500) { if (rand > 75) - gRecvCmds[1][2] = 0x4523; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; else - gRecvCmds[1][2] = 0x5432; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; - gRecvCmds[1][2] = 0x5432; + // BUG: Overrwrote above assignment. Opponent 1 can't get Best at low speed + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; } - else if (sBerryBlenderData->field_4C < 1500) + else if (sBerryBlender->speed < 1500) { if (rand > 80) { - gRecvCmds[1][2] = 0x4523; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; } else { u8 value = rand - 21; if (value < 60) - gRecvCmds[1][2] = 0x5432; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; else if (rand < 10) - sub_8080E6C(1, 5); + CreateOpponentMissTask(1, 5); } } else if (rand <= 90) { u8 value = rand - 71; if (value < 20) - gRecvCmds[1][2] = 0x5432; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; else if (rand < 30) - sub_8080E6C(1, 5); + CreateOpponentMissTask(1, 5); } else { - gRecvCmds[1][2] = 0x4523; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; } } else { - gRecvCmds[1][2] = 0x4523; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; } - gTasks[taskId].data[0] = 1; + gTasks[taskId].tDidInput = TRUE; } } else { - gTasks[taskId].data[0] = 0; + gTasks[taskId].tDidInput = FALSE; } } -static void sub_8080FD0(u8 taskId) +static void Task_HandleOpponent2(u8 taskId) { - u32 var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF; - u32 var2 = sBerryBlenderData->field_96[2] & 0xFF; - if ((var1 >> 8) > sUnknown_083399E7[var2] + 20 && (var1 >> 8) < sUnknown_083399E7[var2] + 40) + u32 var1 = (sBerryBlender->arrowPos + 0x1800) & 0xFFFF; + u32 arrowId = sBerryBlender->playerIdToArrowId[2] & 0xFF; + if ((var1 >> 8) > sArrowHitRangeStart[arrowId] + 20 && (var1 >> 8) < sArrowHitRangeStart[arrowId] + 40) { - if (gTasks[taskId].data[0] == 0) + if (!gTasks[taskId].tDidInput) { - if (sBerryBlenderData->field_123 == 0) + if (!sBerryBlender->perfectOpponents) { u8 rand = Random() / 655; - if (sBerryBlenderData->field_4C < 500) + if (sBerryBlender->speed < 500) { if (rand > 66) - gRecvCmds[2][2] = 0x4523; + gRecvCmds[2][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; else - gRecvCmds[2][2] = 0x5432; + gRecvCmds[2][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; } else { u8 value; if (rand > 65) - gRecvCmds[2][2] = 0x4523; + gRecvCmds[2][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; value = rand - 41; if (value < 25) - gRecvCmds[2][2] = 0x5432; + gRecvCmds[2][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; if (rand < 10) - sub_8080E6C(2, 5); + CreateOpponentMissTask(2, 5); } - gTasks[taskId].data[0] = 1; + gTasks[taskId].tDidInput = TRUE; } else { - gRecvCmds[2][2] = 0x4523; - gTasks[taskId].data[0] = 1; + gRecvCmds[2][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; + gTasks[taskId].tDidInput = TRUE; } } } else { - gTasks[taskId].data[0] = 0; + gTasks[taskId].tDidInput = FALSE; } } -static void sub_80810F8(u8 taskId) +static void Task_HandleOpponent3(u8 taskId) { - u32 var1, var2; - - var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF; - var2 = sBerryBlenderData->field_96[3] & 0xFF; - if ((var1 >> 8) > sUnknown_083399E7[var2] + 20 && (var1 >> 8) < sUnknown_083399E7[var2] + 40) + u32 var1 = (sBerryBlender->arrowPos + 0x1800) & 0xFFFF; + u32 arrowId = sBerryBlender->playerIdToArrowId[3] & 0xFF; + if ((var1 >> 8) > sArrowHitRangeStart[arrowId] + 20 && (var1 >> 8) < sArrowHitRangeStart[arrowId] + 40) { if (gTasks[taskId].data[0] == 0) { - if (sBerryBlenderData->field_123 == 0) + if (!sBerryBlender->perfectOpponents) { u8 rand = (Random() / 655); - if (sBerryBlenderData->field_4C < 500) + if (sBerryBlender->speed < 500) { if (rand > 88) - gRecvCmds[3][2] = 0x4523; + gRecvCmds[3][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; else - gRecvCmds[3][2] = 0x5432; + gRecvCmds[3][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; } else { if (rand > 60) { - gRecvCmds[3][2] = 0x4523; + gRecvCmds[3][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; } else { s8 value = rand - 56; // makes me wonder what the original code was u8 value2 = value; if (value2 < 5) - gRecvCmds[3][2] = 0x5432; + gRecvCmds[3][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; } if (rand < 5) - sub_8080E6C(3, 5); + CreateOpponentMissTask(3, 5); } - gTasks[taskId].data[0] = 1; + gTasks[taskId].tDidInput = TRUE; } else { - gRecvCmds[3][2] = 0x4523; - gTasks[taskId].data[0] = 1; + gRecvCmds[3][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; + gTasks[taskId].tDidInput = TRUE; } } } else { - gTasks[taskId].data[0] = 0; + gTasks[taskId].tDidInput = FALSE; } } -static void sub_8081224(u8 taskId) +static void Task_HandleBerryMaster(u8 taskId) { - if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2) + if (GetArrowProximity(sBerryBlender->arrowPos, 1) == PROXIMITY_BEST) { - if (gTasks[taskId].data[0] == 0) + if (!gTasks[taskId].tDidInput) { - gRecvCmds[1][2] = 0x4523; - gTasks[taskId].data[0] = 1; + gRecvCmds[1][BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; + gTasks[taskId].tDidInput = TRUE; } } else { - gTasks[taskId].data[0] = 0; + gTasks[taskId].tDidInput = FALSE; } } -static void sub_8081288(u16 a0, u8 a1) +#undef tDidInput + +static void CreateScoreSymbolSprite(u16 cmd, u8 arrowId) { u8 spriteId; - spriteId = CreateSprite(&sUnknown_08339B40, - sBlenderSyncArrowsPos[a1][0] - (10 * sUnknown_083399C0[a1][0]), - sBlenderSyncArrowsPos[a1][1] - (10 * sUnknown_083399C0[a1][1]), + spriteId = CreateSprite(&sSpriteTemplate_ScoreSymbols, + sPlayerArrowPos[arrowId][0] - (10 * sPlayerArrowQuadrant[arrowId][0]), + sPlayerArrowPos[arrowId][1] - (10 * sPlayerArrowQuadrant[arrowId][1]), 1); - if (a0 == 0x4523) + if (cmd == LINKCMD_BLENDER_SCORE_BEST) { - StartSpriteAnim(&gSprites[spriteId], 2); - gSprites[spriteId].callback = sub_8082F9C; - PlaySE(SE_RU_GASHIN); + StartSpriteAnim(&gSprites[spriteId], SCOREANIM_BEST_FLASH); + gSprites[spriteId].callback = SpriteCB_ScoreSymbolBest; + PlaySE(SE_ICE_STAIRS); } - else if (a0 == 0x5432) + else if (cmd == LINKCMD_BLENDER_SCORE_GOOD) { - StartSpriteAnim(&gSprites[spriteId], 0); - PlaySE(SE_SEIKAI); + StartSpriteAnim(&gSprites[spriteId], SCOREANIM_GOOD); + PlaySE(SE_SUCCESS); } - else if (a0 == 0x2345) + else if (cmd == LINKCMD_BLENDER_SCORE_MISS) { - StartSpriteAnim(&gSprites[spriteId], 1); - PlaySE(SE_HAZURE); + StartSpriteAnim(&gSprites[spriteId], SCOREANIM_MISS); + PlaySE(SE_FAILURE); } - sub_8082E84(); + CreateParticleSprites(); } -static void sub_8081370(u16 a0) +static void UpdateSpeedFromHit(u16 cmd) { - Blender_ControlHitPitch(); - switch (a0) + UpdateHitPitch(); + switch (cmd) { - case 0x4523: - if (sBerryBlenderData->field_4C < 1500) - sBerryBlenderData->field_4C += (0x180 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); + case LINKCMD_BLENDER_SCORE_BEST: + if (sBerryBlender->speed < 1500) { + sBerryBlender->speed += (384 / sNumPlayersToSpeedDivisor[sBerryBlender->numPlayers]); + } else { - sBerryBlenderData->field_4C += (128 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); - sub_80832BC(&sBerryBlenderData->bg_X, (sBerryBlenderData->field_4C / 100) - 10); - sub_80832BC(&sBerryBlenderData->bg_Y, (sBerryBlenderData->field_4C / 100) - 10); + sBerryBlender->speed += (128 / sNumPlayersToSpeedDivisor[sBerryBlender->numPlayers]); + ShakeBgCoordForHit(&sBerryBlender->bg_X, (sBerryBlender->speed / 100) - 10); + ShakeBgCoordForHit(&sBerryBlender->bg_Y, (sBerryBlender->speed / 100) - 10); } break; - case 0x5432: - if (sBerryBlenderData->field_4C < 1500) - sBerryBlenderData->field_4C += (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); + case LINKCMD_BLENDER_SCORE_GOOD: + if (sBerryBlender->speed < 1500) + sBerryBlender->speed += (256 / sNumPlayersToSpeedDivisor[sBerryBlender->numPlayers]); break; - case 0x2345: - sBerryBlenderData->field_4C -= (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); - if (sBerryBlenderData->field_4C < 0x80) - sBerryBlenderData->field_4C = 0x80; + case LINKCMD_BLENDER_SCORE_MISS: + sBerryBlender->speed -= (256 / sNumPlayersToSpeedDivisor[sBerryBlender->numPlayers]); + if (sBerryBlender->speed < MIN_ARROW_SPEED) + sBerryBlender->speed = MIN_ARROW_SPEED; break; } } -static bool32 sub_80814B0(u16 arg0, u16 arg1, u16 arg2) +// Return TRUE if the received command matches the corresponding Link or RFU command +static bool32 CheckRecvCmdMatches(u16 recvCmd, u16 linkCmd, u16 rfuCmd) { - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) + if (gReceivedRemoteLinkPlayers && gWirelessCommType) { - if ((arg0 & 0xFF00) == arg2) + if ((recvCmd & 0xFF00) == rfuCmd) return TRUE; } else { - if (arg0 == arg1) + if (recvCmd == linkCmd) return TRUE; } return FALSE; } -static void sub_80814F4(void) +static void UpdateOpponentScores(void) { s32 i; if (gSpecialVar_0x8004 != 0) { - if (gSendCmd[2] != 0) + // Local game, "send" players score to itself + if (gSendCmd[BLENDER_COMM_SCORE] != 0) { - gRecvCmds[0][2] = gSendCmd[2]; - gRecvCmds[0][0] = 0x4444; - gSendCmd[2] = 0; + gRecvCmds[0][BLENDER_COMM_SCORE] = gSendCmd[BLENDER_COMM_SCORE]; + gRecvCmds[0][BLENDER_COMM_INPUT_STATE] = LINKCMD_BLENDER_SEND_KEYS; + gSendCmd[BLENDER_COMM_SCORE] = 0; } - for (i = 1; i < 4; i++) + + // Local game, simulate NPCs sending keys + // Their actual inputs are handled by Task_HandleOpponent + for (i = 1; i < BLENDER_MAX_PLAYERS; i++) { - if (gRecvCmds[i][2] != 0) - gRecvCmds[i][0] = 0x4444; + if (gRecvCmds[i][BLENDER_COMM_SCORE] != 0) + gRecvCmds[i][BLENDER_COMM_INPUT_STATE] = LINKCMD_BLENDER_SEND_KEYS; } } - for (i = 0; i < sBerryBlenderData->playersNo; i++) + for (i = 0; i < sBerryBlender->numPlayers; i++) { - if (sub_80814B0(gRecvCmds[i][0], 0x4444, 0x4400)) + if (CheckRecvCmdMatches(gRecvCmds[i][BLENDER_COMM_INPUT_STATE], LINKCMD_BLENDER_SEND_KEYS, RFUCMD_BLENDER_SEND_KEYS)) { - u32 var = sBerryBlenderData->field_96[i]; - if (gRecvCmds[i][2] == 0x4523) + u32 arrowId = sBerryBlender->playerIdToArrowId[i]; + if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_BEST) { - sub_8081370(0x4523); - sBerryBlenderData->field_116 += (sBerryBlenderData->field_4C / 55); - if (sBerryBlenderData->field_116 >= 1000) - sBerryBlenderData->field_116 = 1000; - sub_8081288(0x4523, var); - sBerryBlenderData->scores[i][BLENDER_SCORE_BEST]++; + UpdateSpeedFromHit(LINKCMD_BLENDER_SCORE_BEST); + sBerryBlender->progressBarValue += (sBerryBlender->speed / 55); + if (sBerryBlender->progressBarValue >= MAX_PROGRESS_BAR) + sBerryBlender->progressBarValue = MAX_PROGRESS_BAR; + CreateScoreSymbolSprite(LINKCMD_BLENDER_SCORE_BEST, arrowId); + sBerryBlender->scores[i][SCORE_BEST]++; } - else if (gRecvCmds[i][2] == 0x5432) + else if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_GOOD) { - sub_8081370(0x5432); - sBerryBlenderData->field_116 += (sBerryBlenderData->field_4C / 70); - sub_8081288(0x5432, var); - sBerryBlenderData->scores[i][BLENDER_SCORE_GOOD]++; + UpdateSpeedFromHit(LINKCMD_BLENDER_SCORE_GOOD); + sBerryBlender->progressBarValue += (sBerryBlender->speed / 70); + CreateScoreSymbolSprite(LINKCMD_BLENDER_SCORE_GOOD, arrowId); + sBerryBlender->scores[i][SCORE_GOOD]++; } - else if (gRecvCmds[i][2] == 0x2345) + else if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS) { - sub_8081288(0x2345, var); - sub_8081370(0x2345); - if (sBerryBlenderData->scores[i][BLENDER_SCORE_MISS] < 999) - sBerryBlenderData->scores[i][BLENDER_SCORE_MISS]++; + CreateScoreSymbolSprite(LINKCMD_BLENDER_SCORE_MISS, arrowId); + UpdateSpeedFromHit(LINKCMD_BLENDER_SCORE_MISS); + if (sBerryBlender->scores[i][SCORE_MISS] < 999) + sBerryBlender->scores[i][SCORE_MISS]++; } - if (gRecvCmds[i][2] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) // could be a bug, 2 and i are reversed + + // BUG: Should [i][BLENDER_COMM_SCORE] below, not [BLENDER_COMM_SCORE][i] + // As a result the music tempo updates if any player misses, but only if 1 specific player hits + if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS + || gRecvCmds[BLENDER_COMM_SCORE][i] == LINKCMD_BLENDER_SCORE_BEST + || gRecvCmds[BLENDER_COMM_SCORE][i] == LINKCMD_BLENDER_SCORE_GOOD) { - if (sBerryBlenderData->field_4C > 1500) - m4aMPlayTempoControl(&gMPlayInfo_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256); + if (sBerryBlender->speed > 1500) + m4aMPlayTempoControl(&gMPlayInfo_BGM, ((sBerryBlender->speed - 750) / 20) + 256); else - m4aMPlayTempoControl(&gMPlayInfo_BGM, 0x100); + m4aMPlayTempoControl(&gMPlayInfo_BGM, 256); } } } if (gSpecialVar_0x8004 != 0) { - for (i = 0; i < sBerryBlenderData->playersNo; i++) + for (i = 0; i < sBerryBlender->numPlayers; i++) { - gRecvCmds[i][0] = 0; - gRecvCmds[i][2] = 0; + gRecvCmds[i][BLENDER_COMM_INPUT_STATE] = 0; + gRecvCmds[i][BLENDER_COMM_SCORE] = 0; } } } -static void sub_8081744(void) +static void HandlePlayerInput(void) { - u8 var2; - bool8 A_pressed = FALSE; + u8 arrowId; + bool8 pressedA = FALSE; u8 playerId = 0; - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) playerId = GetMultiplayerId(); - var2 = sBerryBlenderData->field_96[playerId]; + arrowId = sBerryBlender->playerIdToArrowId[playerId]; - if (sBerryBlenderData->gameEndState == 0) + if (sBerryBlender->gameEndState == 0) { - if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A && gMain.newKeys & A_BUTTON) + if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A && JOY_NEW(A_BUTTON)) { - if ((gMain.heldKeysRaw & (A_BUTTON | L_BUTTON)) != (A_BUTTON | L_BUTTON)) - A_pressed = TRUE; + if (JOY_HELD_RAW(A_BUTTON | L_BUTTON) != (A_BUTTON | L_BUTTON)) + pressedA = TRUE; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { - A_pressed = TRUE; + pressedA = TRUE; } - if (A_pressed) + if (pressedA) { - u8 var3; - StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[var2]]], var2 + 4); - var3 = sub_8080624(sBerryBlenderData->arrowPos, playerId); + u8 proximity; + StartSpriteAnim(&gSprites[sBerryBlender->playerArrowSpriteIds[sBerryBlender->arrowIdToPlayerId[arrowId]]], arrowId + 4); + proximity = GetArrowProximity(sBerryBlender->arrowPos, playerId); - if (var3 == 2) - gSendCmd[2] = 0x4523; - else if (var3 == 1) - gSendCmd[2] = 0x5432; + if (proximity == PROXIMITY_BEST) + gSendCmd[BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_BEST; + else if (proximity == PROXIMITY_GOOD) + gSendCmd[BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_GOOD; else - gSendCmd[2] = 0x2345; + gSendCmd[BLENDER_COMM_SCORE] = LINKCMD_BLENDER_SCORE_MISS; } } - if (++sBerryBlenderData->field_72 > 5) + if (++sBerryBlender->slowdownTimer > 5) { - if (sBerryBlenderData->field_4C > 128) - sBerryBlenderData->field_4C--; - sBerryBlenderData->field_72 = 0; + if (sBerryBlender->speed > MIN_ARROW_SPEED) + sBerryBlender->speed--; + sBerryBlender->slowdownTimer = 0; } - if (gEnableContestDebugging && gMain.newKeys & L_BUTTON) - sBerryBlenderData->field_123 ^= 1; + + if (gEnableContestDebugging && JOY_NEW(L_BUTTON)) + sBerryBlender->perfectOpponents ^= 1; } -static void sub_8081898(void) +static void CB2_PlayBlender(void) { - sub_8082D28(); + UpdateBlenderCenter(); - if (sBerryBlenderData->gameFrameTime < (99 * 60 * 60) + (59 * 60)) // game time can't be longer than 99 minutes and 59 seconds, can't print 3 digits - sBerryBlenderData->gameFrameTime++; + if (sBerryBlender->gameFrameTime < (99 * 60 * 60) + (59 * 60)) // game time can't be longer than 99 minutes and 59 seconds, can't print 3 digits + sBerryBlender->gameFrameTime++; - sub_8081744(); - SetLinkDebugValues((u16)(sBerryBlenderData->field_4C), sBerryBlenderData->field_116); - sub_80814F4(); - sub_8083140(sBerryBlenderData->field_116, 1000); - sub_8083230(sBerryBlenderData->field_4C); - sub_808330C(); - sub_8082AD4(); - if (sBerryBlenderData->gameEndState == 0 && sBerryBlenderData->field_118 >= 1000) + HandlePlayerInput(); + SetLinkDebugValues((u16)(sBerryBlender->speed), sBerryBlender->progressBarValue); + UpdateOpponentScores(); + TryUpdateProgressBar(sBerryBlender->progressBarValue, MAX_PROGRESS_BAR); + UpdateRPM(sBerryBlender->speed); + RestoreBgCoords(); + ProcessLinkPlayerCmds(); + if (sBerryBlender->gameEndState == 0 && sBerryBlender->maxProgressBarValue >= MAX_PROGRESS_BAR) { - sBerryBlenderData->field_116 = 1000; - sBerryBlenderData->gameEndState = 1; - SetMainCallback2(CB2_HandleBlenderEndGame); + sBerryBlender->progressBarValue = MAX_PROGRESS_BAR; + sBerryBlender->gameEndState = 1; + SetMainCallback2(CB2_EndBlenderGame); } - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -2077,362 +2236,380 @@ static void Blender_DummiedOutFunc(s16 a0, s16 a1) } -static bool8 sub_8081964(struct BlenderBerry* berries, u8 index1, u8 index2) +static bool8 AreBlenderBerriesSame(struct BlenderBerry* berries, u8 a, u8 b) { - if (berries[index1].itemId != berries[index2].itemId - || (StringCompare(berries[index1].name, berries[index2].name) == 0 - && (berries[index1].flavors[FLAVOR_SPICY] == berries[index2].flavors[FLAVOR_SPICY] - && berries[index1].flavors[FLAVOR_DRY] == berries[index2].flavors[FLAVOR_DRY] - && berries[index1].flavors[FLAVOR_SWEET] == berries[index2].flavors[FLAVOR_SWEET] - && berries[index1].flavors[FLAVOR_BITTER] == berries[index2].flavors[FLAVOR_BITTER] - && berries[index1].flavors[FLAVOR_SOUR] == berries[index2].flavors[FLAVOR_SOUR] - && berries[index1].smoothness == berries[index2].smoothness))) + // First check to itemId is pointless (and wrong anyway?), always false when this is called + // Only used to determine if two enigma berries are equivalent + if (berries[a].itemId != berries[b].itemId + || (StringCompare(berries[a].name, berries[b].name) == 0 + && (berries[a].flavors[FLAVOR_SPICY] == berries[b].flavors[FLAVOR_SPICY] + && berries[a].flavors[FLAVOR_DRY] == berries[b].flavors[FLAVOR_DRY] + && berries[a].flavors[FLAVOR_SWEET] == berries[b].flavors[FLAVOR_SWEET] + && berries[a].flavors[FLAVOR_BITTER] == berries[b].flavors[FLAVOR_BITTER] + && berries[a].flavors[FLAVOR_SOUR] == berries[b].flavors[FLAVOR_SOUR] + && berries[a].flavors[FLAVOR_COUNT] == berries[b].flavors[FLAVOR_COUNT]))) return TRUE; else return FALSE; } -static u32 Blender_GetPokeblockColor(struct BlenderBerry* berries, s16* a1, u8 playersNo, u8 a3) +static u32 CalculatePokeblockColor(struct BlenderBerry* berries, s16* _flavors, u8 numPlayers, u8 negativeFlavors) { - s16 vars[6]; - s32 i; - s32 r6; - u8 r2; + s16 flavors[FLAVOR_COUNT + 1]; + s32 i, j; + u8 numFlavors; - for (i = 0; i < 6; i++) - vars[i] = a1[i]; + for (i = 0; i < FLAVOR_COUNT + 1; i++) + flavors[i] = _flavors[i]; - r6 = 0; - for (i = 0; i < 5; i++) + j = 0; + for (i = 0; i < FLAVOR_COUNT; i++) { - if (vars[i] == 0) - r6++; + if (flavors[i] == 0) + j++; } - if (r6 == 5 || a3 > 3) - return 12; - for (i = 0; i < playersNo; i++) + + // If all flavors are 0, or at least 3 were negative/0 + // or if players used the same berry, color is black + if (j == 5 || negativeFlavors > 3) + return PBLOCK_CLR_BLACK; + + for (i = 0; i < numPlayers; i++) { - for (r6 = 0; r6 < playersNo; r6++) + for (j = 0; j < numPlayers; j++) { - if (berries[i].itemId == berries[r6].itemId && i != r6 - && (berries[i].itemId != ITEM_ENIGMA_BERRY || sub_8081964(berries, i, r6))) - return 12; + if (berries[i].itemId == berries[j].itemId && i != j + && (berries[i].itemId != ITEM_ENIGMA_BERRY || AreBlenderBerriesSame(berries, i, j))) + return PBLOCK_CLR_BLACK; } } - r2 = 0; - for (r2 = 0, i = 0; i < 5; i++) + + numFlavors = 0; + for (numFlavors = 0, i = 0; i < FLAVOR_COUNT; i++) { - if (vars[i] > 0) - r2++; + if (flavors[i] > 0) + numFlavors++; } - if (r2 > 3) - return 13; - if (r2 == 3) - return 11; - for (i = 0; i < 5; i++) + + // Check for special colors (White/Gray/Gold) + if (numFlavors > 3) + return PBLOCK_CLR_WHITE; + + if (numFlavors == 3) + return PBLOCK_CLR_GRAY; + + for (i = 0; i < FLAVOR_COUNT; i++) { - if (vars[i] > 50) - return 14; + if (flavors[i] > 50) + return PBLOCK_CLR_GOLD; } - if (r2 == 1 && vars[0] > 0) - return 1; - if (r2 == 1 && vars[1] > 0) - return 2; - if (r2 == 1 && vars[2] > 0) - return 3; - if (r2 == 1 && vars[3] > 0) - return 4; - if (r2 == 1 && vars[4] > 0) - return 5; - if (r2 == 2) + + // Only 1 flavor present, return corresponding color + if (numFlavors == 1 && flavors[FLAVOR_SPICY] > 0) + return PBLOCK_CLR_RED; + if (numFlavors == 1 && flavors[FLAVOR_DRY] > 0) + return PBLOCK_CLR_BLUE; + if (numFlavors == 1 && flavors[FLAVOR_SWEET] > 0) + return PBLOCK_CLR_PINK; + if (numFlavors == 1 && flavors[FLAVOR_BITTER] > 0) + return PBLOCK_CLR_GREEN; + if (numFlavors == 1 && flavors[FLAVOR_SOUR] > 0) + return PBLOCK_CLR_YELLOW; + + if (numFlavors == 2) { - s32 var = 0; - for (i = 0; i < 5; i++) + // Determine which 2 flavors are present + s32 idx = 0; + for (i = 0; i < FLAVOR_COUNT; i++) { - if (vars[i] > 0) - sUnknown_03000DF8[var++] = i; + if (flavors[i] > 0) + sPokeblockPresentFlavors[idx++] = i; } - if (vars[sUnknown_03000DF8[0]] >= vars[sUnknown_03000DF8[1]]) + // Use the stronger flavor to determine color + // The weaker flavor is returned in the upper 16 bits, but this is ignored in the color assignment + if (flavors[sPokeblockPresentFlavors[0]] >= flavors[sPokeblockPresentFlavors[1]]) { - if (sUnknown_03000DF8[0] == 0) - return (sUnknown_03000DF8[1] << 16) | 6; - if (sUnknown_03000DF8[0] == 1) - return (sUnknown_03000DF8[1] << 16) | 7; - if (sUnknown_03000DF8[0] == 2) - return (sUnknown_03000DF8[1] << 16) | 8; - if (sUnknown_03000DF8[0] == 3) - return (sUnknown_03000DF8[1] << 16) | 9; - if (sUnknown_03000DF8[0] == 4) - return (sUnknown_03000DF8[1] << 16) | 10; + if (sPokeblockPresentFlavors[0] == FLAVOR_SPICY) + return (sPokeblockPresentFlavors[1] << 16) | PBLOCK_CLR_PURPLE; + if (sPokeblockPresentFlavors[0] == FLAVOR_DRY) + return (sPokeblockPresentFlavors[1] << 16) | PBLOCK_CLR_INDIGO; + if (sPokeblockPresentFlavors[0] == FLAVOR_SWEET) + return (sPokeblockPresentFlavors[1] << 16) | PBLOCK_CLR_BROWN; + if (sPokeblockPresentFlavors[0] == FLAVOR_BITTER) + return (sPokeblockPresentFlavors[1] << 16) | PBLOCK_CLR_LITE_BLUE; + if (sPokeblockPresentFlavors[0] == FLAVOR_SOUR) + return (sPokeblockPresentFlavors[1] << 16) | PBLOCK_CLR_OLIVE; } else { - if (sUnknown_03000DF8[1] == 0) - return (sUnknown_03000DF8[0] << 16) | 6; - if (sUnknown_03000DF8[1] == 1) - return (sUnknown_03000DF8[0] << 16) | 7; - if (sUnknown_03000DF8[1] == 2) - return (sUnknown_03000DF8[0] << 16) | 8; - if (sUnknown_03000DF8[1] == 3) - return (sUnknown_03000DF8[0] << 16) | 9; - if (sUnknown_03000DF8[1] == 4) - return (sUnknown_03000DF8[0] << 16) | 10; + if (sPokeblockPresentFlavors[1] == FLAVOR_SPICY) + return (sPokeblockPresentFlavors[0] << 16) | PBLOCK_CLR_PURPLE; + if (sPokeblockPresentFlavors[1] == FLAVOR_DRY) + return (sPokeblockPresentFlavors[0] << 16) | PBLOCK_CLR_INDIGO; + if (sPokeblockPresentFlavors[1] == FLAVOR_SWEET) + return (sPokeblockPresentFlavors[0] << 16) | PBLOCK_CLR_BROWN; + if (sPokeblockPresentFlavors[1] == FLAVOR_BITTER) + return (sPokeblockPresentFlavors[0] << 16) | PBLOCK_CLR_LITE_BLUE; + if (sPokeblockPresentFlavors[1] == FLAVOR_SOUR) + return (sPokeblockPresentFlavors[0] << 16) | PBLOCK_CLR_OLIVE; } } - return 0; + return PBLOCK_CLR_NONE; } -static void sub_8081BB0(s16 value) +static void Debug_SetMaxRPMStage(s16 value) { - sUnknown_03000E04 = value; + sDebug_MaxRPMStage = value; } -static s16 sub_8081BBC(void) +// Unused +static s16 Debug_GetMaxRPMStage(void) { - return sUnknown_03000E04; + return sDebug_MaxRPMStage; } -static void sub_8081BC8(s16 value) +static void Debug_SetGameTimeStage(s16 value) { - sUnknown_03000E06 = value; + sDebug_GameTimeStage = value; } -static s16 sub_8081BD4(void) +// Unued +static s16 Debug_GetGameTimeStage(void) { - return sUnknown_03000E06; + return sDebug_GameTimeStage; } -#if MODERN -// TODO remove this as soon as the code below is understood -// add a UBFIX if required (code buggy?) -__attribute__((optimize("no-aggressive-loop-optimizations"))) -#endif -static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavors, u16 maxRPM) +static void CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 numPlayers, u8 *flavors, u16 maxRPM) { s32 i, j; s32 multiuseVar, var2; - u8 var3; + u8 numNegatives; - for (i = 0; i < 6; i++) - sUnknown_03000DE8[i] = 0; + for (i = 0; i < FLAVOR_COUNT + 1; i++) + sPokeblockFlavors[i] = 0; - for (i = 0; i < playersNo; i++) + // Add up the flavor + feel of each players berry + for (i = 0; i < numPlayers; i++) { - for (j = 0; j < 6; j++) - sUnknown_03000DE8[j] += berries[i].flavors[j]; + for (j = 0; j < FLAVOR_COUNT + 1; j++) + sPokeblockFlavors[j] += berries[i].flavors[j]; } - multiuseVar = sUnknown_03000DE8[0]; - sUnknown_03000DE8[0] -= sUnknown_03000DE8[1]; - sUnknown_03000DE8[1] -= sUnknown_03000DE8[2]; - sUnknown_03000DE8[2] -= sUnknown_03000DE8[3]; - sUnknown_03000DE8[3] -= sUnknown_03000DE8[4]; - sUnknown_03000DE8[4] -= multiuseVar; + // Subtract each flavor total from the prev one + // The idea is to focus on only the flavors with the highest totals + // Bad way to do it though (order matters here) + multiuseVar = sPokeblockFlavors[0]; + sPokeblockFlavors[FLAVOR_SPICY] -= sPokeblockFlavors[FLAVOR_DRY]; + sPokeblockFlavors[FLAVOR_DRY] -= sPokeblockFlavors[FLAVOR_SWEET]; + sPokeblockFlavors[FLAVOR_SWEET] -= sPokeblockFlavors[FLAVOR_BITTER]; + sPokeblockFlavors[FLAVOR_BITTER] -= sPokeblockFlavors[FLAVOR_SOUR]; + sPokeblockFlavors[FLAVOR_SOUR] -= multiuseVar; + // Count (and reset) the resulting negative flavors multiuseVar = 0; - for (i = 0; i < 5; i++) + for (i = 0; i < FLAVOR_COUNT; i++) { - if (sUnknown_03000DE8[i] < 0) + if (sPokeblockFlavors[i] < 0) { - sUnknown_03000DE8[i] = 0; + sPokeblockFlavors[i] = 0; multiuseVar++; } } - var3 = multiuseVar; - for (i = 0; i < 5; i++) + numNegatives = multiuseVar; + + // Subtract the number of negative flavor totals from each positive total (without going below 0) + for (i = 0; i < FLAVOR_COUNT; i++) { - if (sUnknown_03000DE8[i] > 0) + if (sPokeblockFlavors[i] > 0) { - if (sUnknown_03000DE8[i] < multiuseVar) - sUnknown_03000DE8[i] = 0; + if (sPokeblockFlavors[i] < multiuseVar) + sPokeblockFlavors[i] = 0; else - sUnknown_03000DE8[i] -= multiuseVar; - } - } - for (i = 0; i < 5; i++) - { - sUnknown_020322A8[i] = sUnknown_03000DE8[i]; - } - - multiuseVar = maxRPM / 333 + 100; - sUnknown_020322D0 = multiuseVar; - - for (i = 0; i < 5; i++) - { - s32 r4; - s32 r5 = sUnknown_03000DE8[i]; - r5 = (r5 * multiuseVar) / 10; - r4 = r5 % 10; - r5 /= 10; - if (r4 > 4) - r5++; - sUnknown_03000DE8[i] = r5; - } - for (i = 0; i < 5; i++) - { - sUnknown_020322BC[i] = sUnknown_03000DE8[i]; - } - - pokeblock->color = Blender_GetPokeblockColor(berries, &sUnknown_03000DE8[0], playersNo, var3); - sUnknown_03000DE8[5] = (sUnknown_03000DE8[5] / playersNo) - playersNo; - - if (sUnknown_03000DE8[5] < 0) - sUnknown_03000DE8[5] = 0; - - if (pokeblock->color == 12) - { - multiuseVar = Random() % 10; - for (i = 0; i < 5; i++) - { - if ((sUnknown_08339CC8[multiuseVar] >> i) & 1) - sUnknown_03000DE8[i] = 2; - else - sUnknown_03000DE8[i] = 0; + sPokeblockFlavors[i] -= multiuseVar; } } - for (i = 0; i < 6; i++) + for (i = 0; i < FLAVOR_COUNT; i++) + sDebug_PokeblockFactorFlavors[i] = sPokeblockFlavors[i]; + + // Factor in max RPM and round + sDebug_PokeblockFactorRPM = multiuseVar = maxRPM / 333 + 100; + for (i = 0; i < FLAVOR_COUNT; i++) { - if (sUnknown_03000DE8[i] > 255) - sUnknown_03000DE8[i] = 255; + s32 remainder; + s32 flavor = sPokeblockFlavors[i]; + flavor = (flavor * multiuseVar) / 10; + remainder = flavor % 10; + flavor /= 10; + if (remainder > 4) + flavor++; + sPokeblockFlavors[i] = flavor; } - pokeblock->spicy = sUnknown_03000DE8[0]; - pokeblock->dry = sUnknown_03000DE8[1]; - pokeblock->sweet = sUnknown_03000DE8[2]; - pokeblock->bitter = sUnknown_03000DE8[3]; - pokeblock->sour = sUnknown_03000DE8[4]; - pokeblock->feel = sUnknown_03000DE8[5]; + for (i = 0; i < FLAVOR_COUNT; i++) + sDebug_PokeblockFactorFlavorsAfterRPM[i] = sPokeblockFlavors[i]; - for (i = 0; i < 6; i++) + // Calculate color and feel of pokeblock + pokeblock->color = CalculatePokeblockColor(berries, &sPokeblockFlavors[0], numPlayers, numNegatives); + sPokeblockFlavors[FLAVOR_COUNT] = (sPokeblockFlavors[FLAVOR_COUNT] / numPlayers) - numPlayers; + + if (sPokeblockFlavors[FLAVOR_COUNT] < 0) + sPokeblockFlavors[FLAVOR_COUNT] = 0; + + if (pokeblock->color == PBLOCK_CLR_BLACK) { - flavors[i] = sUnknown_03000DE8[i]; + // Black pokeblocks get their flavors randomly reassigned + multiuseVar = Random() % ARRAY_COUNT(sBlackPokeblockFlavorFlags); + for (i = 0; i < FLAVOR_COUNT; i++) + { + if ((sBlackPokeblockFlavorFlags[multiuseVar] >> i) & 1) + sPokeblockFlavors[i] = 2; + else + sPokeblockFlavors[i] = 0; + } } + + for (i = 0; i < FLAVOR_COUNT + 1; i++) + { + if (sPokeblockFlavors[i] > 255) + sPokeblockFlavors[i] = 255; + } + + pokeblock->spicy = sPokeblockFlavors[FLAVOR_SPICY]; + pokeblock->dry = sPokeblockFlavors[FLAVOR_DRY]; + pokeblock->sweet = sPokeblockFlavors[FLAVOR_SWEET]; + pokeblock->bitter = sPokeblockFlavors[FLAVOR_BITTER]; + pokeblock->sour = sPokeblockFlavors[FLAVOR_SOUR]; + pokeblock->feel = sPokeblockFlavors[FLAVOR_COUNT]; + + for (i = 0; i < FLAVOR_COUNT + 1; i++) + flavors[i] = sPokeblockFlavors[i]; } -static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavors, u16 a4) +// Unused +static void Debug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 numPlayers, u8* flavors, u16 maxRPM) { - Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavors, a4); + CalculatePokeblock(berries, pokeblock, numPlayers, flavors, maxRPM); } -static void sub_8081E20(void) +static void Debug_SetStageVars(void) { - u32 frames = (u16)(sBerryBlenderData->gameFrameTime); - u16 max_RPM = sBerryBlenderData->max_RPM; - s16 var = 0; + u32 frames = (u16)(sBerryBlender->gameFrameTime); + u16 maxRPM = sBerryBlender->maxRPM; + s16 stage = 0; if (frames < 900) - var = 5; + stage = 5; else if ((u16)(frames - 900) < 600) - var = 4; + stage = 4; else if ((u16)(frames - 1500) < 600) - var = 3; + stage = 3; else if ((u16)(frames - 2100) < 900) - var = 2; + stage = 2; else if ((u16)(frames - 3300) < 300) - var = 1; + stage = 1; - sub_8081BC8(var); + Debug_SetGameTimeStage(stage); - var = 0; - if (max_RPM <= 64) + stage = 0; + if (maxRPM <= 64) { - if (max_RPM >= 50 && max_RPM < 100) - var = -1; - else if (max_RPM >= 100 && max_RPM < 150) - var = -2; - else if (max_RPM >= 150 && max_RPM < 200) - var = -3; - else if (max_RPM >= 200 && max_RPM < 250) - var = -4; - else if (max_RPM >= 250 && max_RPM < 300) - var = -5; - else if (max_RPM >= 350 && max_RPM < 400) - var = -6; - else if (max_RPM >= 400 && max_RPM < 450) - var = -7; - else if (max_RPM >= 500 && max_RPM < 550) - var = -8; - else if (max_RPM >= 550 && max_RPM < 600) - var = -9; - else if (max_RPM >= 600) - var = -10; + if (maxRPM >= 50 && maxRPM < 100) + stage = -1; + else if (maxRPM >= 100 && maxRPM < 150) + stage = -2; + else if (maxRPM >= 150 && maxRPM < 200) + stage = -3; + else if (maxRPM >= 200 && maxRPM < 250) + stage = -4; + else if (maxRPM >= 250 && maxRPM < 300) + stage = -5; + else if (maxRPM >= 350 && maxRPM < 400) + stage = -6; + else if (maxRPM >= 400 && maxRPM < 450) + stage = -7; + else if (maxRPM >= 500 && maxRPM < 550) + stage = -8; + else if (maxRPM >= 550 && maxRPM < 600) + stage = -9; + else if (maxRPM >= 600) + stage = -10; } - sub_8081BB0(var); + Debug_SetMaxRPMStage(stage); } -static void sub_8081F94(u16 *a0) +static void SendContinuePromptResponse(u16 *cmd) { - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) - *a0 = 0x2F00; + if (gReceivedRemoteLinkPlayers && gWirelessCommType) + *cmd = RFUCMD_SEND_PACKET; else - *a0 = 0x2FFF; + *cmd = LINKCMD_SEND_PACKET; } -static void CB2_HandleBlenderEndGame(void) +static void CB2_EndBlenderGame(void) { u8 i, j; - if (sBerryBlenderData->gameEndState < 3) - sub_8082D28(); + if (sBerryBlender->gameEndState < 3) + UpdateBlenderCenter(); GetMultiplayerId(); // unused return value - switch (sBerryBlenderData->gameEndState) + switch (sBerryBlender->gameEndState) { case 1: m4aMPlayTempoControl(&gMPlayInfo_BGM, 256); for (i = 0; i < gSpecialVar_0x8004; i++) { - DestroyTask(sBerryBlenderData->field_120[i]); + DestroyTask(sBerryBlender->opponentTaskIds[i]); } - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; break; case 2: - sBerryBlenderData->field_4C -= 32; - if (sBerryBlenderData->field_4C <= 0) + sBerryBlender->speed -= 32; + if (sBerryBlender->speed <= 0) { ClearLinkCallback(); - sBerryBlenderData->field_4C = 0; + sBerryBlender->speed = 0; - if (gReceivedRemoteLinkPlayers != 0) - sBerryBlenderData->gameEndState++; + if (gReceivedRemoteLinkPlayers) + sBerryBlender->gameEndState++; else - sBerryBlenderData->gameEndState = 5; + sBerryBlender->gameEndState = 5; - sBerryBlenderData->mainState = 0; + sBerryBlender->mainState = 0; m4aMPlayStop(&gMPlayInfo_SE2); } - Blender_ControlHitPitch(); + UpdateHitPitch(); break; case 3: if (GetMultiplayerId() != 0) { - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } else if (IsLinkTaskFinished()) { - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) + if (gReceivedRemoteLinkPlayers && gWirelessCommType) { - sBerryBlenderData->gameBlock.timeRPM.time = sBerryBlenderData->gameFrameTime; - sBerryBlenderData->gameBlock.timeRPM.max_RPM = sBerryBlenderData->max_RPM; + sBerryBlender->gameBlock.timeRPM.time = sBerryBlender->gameFrameTime; + sBerryBlender->gameBlock.timeRPM.maxRPM = sBerryBlender->maxRPM; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - for (j = 0; j < BLENDER_SCORES_NO; j++) - sBerryBlenderData->gameBlock.scores[i][j] = sBerryBlenderData->scores[i][j]; + for (j = 0; j < NUM_SCORE_TYPES; j++) + sBerryBlender->gameBlock.scores[i][j] = sBerryBlender->scores[i][j]; } - if (SendBlock(0, &sBerryBlenderData->gameBlock, sizeof(sBerryBlenderData->gameBlock))) - sBerryBlenderData->gameEndState++; + if (SendBlock(0, &sBerryBlender->gameBlock, sizeof(sBerryBlender->gameBlock))) + sBerryBlender->gameEndState++; } else { - sBerryBlenderData->smallBlock.time = sBerryBlenderData->gameFrameTime; - sBerryBlenderData->smallBlock.max_RPM = sBerryBlenderData->max_RPM; - if (SendBlock(0, &sBerryBlenderData->smallBlock, sizeof(sBerryBlenderData->smallBlock) + 32)) - sBerryBlenderData->gameEndState++; + sBerryBlender->smallBlock.time = sBerryBlender->gameFrameTime; + sBerryBlender->smallBlock.maxRPM = sBerryBlender->maxRPM; + if (SendBlock(0, &sBerryBlender->smallBlock, sizeof(sBerryBlender->smallBlock) + 32)) + sBerryBlender->gameEndState++; } } break; @@ -2440,64 +2617,64 @@ static void CB2_HandleBlenderEndGame(void) if (GetBlockReceivedStatus()) { ResetBlockReceivedFlags(); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; - if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) + if (gReceivedRemoteLinkPlayers && gWirelessCommType) { struct BlenderGameBlock *receivedBlock = (struct BlenderGameBlock*)(&gBlockRecvBuffer); - sBerryBlenderData->max_RPM = receivedBlock->timeRPM.max_RPM; - sBerryBlenderData->gameFrameTime = receivedBlock->timeRPM.time; + sBerryBlender->maxRPM = receivedBlock->timeRPM.maxRPM; + sBerryBlender->gameFrameTime = receivedBlock->timeRPM.time; for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - for (j = 0; j < BLENDER_SCORES_NO; j++) - sBerryBlenderData->scores[i][j] = receivedBlock->scores[i][j]; + for (j = 0; j < NUM_SCORE_TYPES; j++) + sBerryBlender->scores[i][j] = receivedBlock->scores[i][j]; } } else { struct TimeAndRPM *receivedBlock = (struct TimeAndRPM*)(&gBlockRecvBuffer); - sBerryBlenderData->max_RPM = receivedBlock->max_RPM; - sBerryBlenderData->gameFrameTime = receivedBlock->time; + sBerryBlender->maxRPM = receivedBlock->maxRPM; + sBerryBlender->gameFrameTime = receivedBlock->time; } } break; case 5: - if (Blender_PrintBlendingRanking()) - sBerryBlenderData->gameEndState++; + if (PrintBlendingRanking()) + sBerryBlender->gameEndState++; break; case 6: - if (Blender_PrintBlendingResults()) + if (PrintBlendingResults()) { if (gInGameOpponentsNo == 0) IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS); else IncrementGameStat(GAME_STAT_POKEBLOCKS); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } break; case 7: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_WouldLikeToBlendAnotherBerry, GetPlayerTextSpeedDelay())) - sBerryBlenderData->gameEndState++; + if (Blender_PrintText(&sBerryBlender->textState, sText_WouldLikeToBlendAnotherBerry, GetPlayerTextSpeedDelay())) + sBerryBlender->gameEndState++; break; case 9: - sBerryBlenderData->yesNoAnswer = 0; - CreateYesNoMenu(&sBlender_YesNoWindowTemplate, 1, 0xD, 0); - sBerryBlenderData->gameEndState++; + sBerryBlender->yesNoAnswer = 0; + CreateYesNoMenu(&sYesNoWindowTemplate_ContinuePlaying, 1, 0xD, 0); + sBerryBlender->gameEndState++; break; case 10: switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 1: case -1: - sBerryBlenderData->yesNoAnswer = 1; - sBerryBlenderData->gameEndState++; - for (i = 0; i yesNoAnswer = 1; + sBerryBlender->gameEndState++; + for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlender->arrowIdToPlayerId[i] != NO_PLAYER) { PutWindowTilemap(i); CopyWindowToVram(i, 3); @@ -2505,11 +2682,11 @@ static void CB2_HandleBlenderEndGame(void) } break; case 0: - sBerryBlenderData->yesNoAnswer = 0; - sBerryBlenderData->gameEndState++; - for (i = 0; i yesNoAnswer = 0; + sBerryBlender->gameEndState++; + for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlender->arrowIdToPlayerId[i] != NO_PLAYER) { PutWindowTilemap(i); CopyWindowToVram(i, 3); @@ -2519,62 +2696,64 @@ static void CB2_HandleBlenderEndGame(void) } break; case 11: - sub_8081F94(&gSendCmd[0]); - if (sBerryBlenderData->yesNoAnswer == 0) + SendContinuePromptResponse(&gSendCmd[BLENDER_COMM_INPUT_STATE]); + if (sBerryBlender->yesNoAnswer == 0) { - if (IsBagPocketNonEmpty(POCKET_BERRIES) == FALSE) // no berries + if (IsBagPocketNonEmpty(POCKET_BERRIES) == FALSE) { - sBerryBlenderData->playAgainState = CANT_PLAY_NO_BERRIES; - gSendCmd[1] = 0x9999; + // No berries + sBerryBlender->playAgainState = CANT_PLAY_NO_BERRIES; + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_BLENDER_NO_BERRIES; } - else if (GetFirstFreePokeblockSlot() == -1) // no space for pokeblocks + else if (GetFirstFreePokeblockSlot() == -1) { - sBerryBlenderData->playAgainState = CANT_PLAY_NO_PKBLCK_SPACE; - gSendCmd[1] = 0xAAAA; + // No space for pokeblocks + sBerryBlender->playAgainState = CANT_PLAY_NO_PKBLCK_SPACE; + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_BLENDER_NO_PBLOCK_SPACE; } else { - sBerryBlenderData->playAgainState = PLAY_AGAIN_OK; - gSendCmd[1] = 0x7779; + sBerryBlender->playAgainState = PLAY_AGAIN_YES; + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_BLENDER_PLAY_AGAIN; } - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } else { - sBerryBlenderData->playAgainState = DONT_PLAY_AGAIN; - gSendCmd[1] = 0x8888; - sBerryBlenderData->gameEndState++; + sBerryBlender->playAgainState = PLAY_AGAIN_NO; + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_CONT_BLOCK; + sBerryBlender->gameEndState++; } break; case 12: if (gInGameOpponentsNo) { - SetMainCallback2(CB2_HandlePlayerPlayAgainChoice); - sBerryBlenderData->gameEndState = 0; - sBerryBlenderData->mainState = 0; + SetMainCallback2(CB2_CheckPlayAgainLocal); + sBerryBlender->gameEndState = 0; + sBerryBlender->mainState = 0; } else { - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } break; case 8: - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; break; case 13: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, GetPlayerTextSpeedDelay())) + if (Blender_PrintText(&sBerryBlender->textState, sText_CommunicationStandby, GetPlayerTextSpeedDelay())) { - SetMainCallback2(CB2_HandlePlayerLinkPlayAgainChoice); - sBerryBlenderData->gameEndState = 0; - sBerryBlenderData->mainState = 0; + SetMainCallback2(CB2_CheckPlayAgainLink); + sBerryBlender->gameEndState = 0; + sBerryBlender->mainState = 0; } break; } - sub_808330C(); - sub_8083230(sBerryBlenderData->field_4C); - sub_8082AD4(); - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + RestoreBgCoords(); + UpdateRPM(sBerryBlender->speed); + ProcessLinkPlayerCmds(); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -2584,30 +2763,30 @@ static void CB2_HandleBlenderEndGame(void) static bool8 LinkPlayAgainHandleSaving(void) { - switch (sBerryBlenderData->field_1A0) + switch (sBerryBlender->linkPlayAgainState) { case 0: SetLinkStandbyCallback(); - sBerryBlenderData->field_1A0 = 1; - sBerryBlenderData->framesToWait = 0; + sBerryBlender->linkPlayAgainState = 1; + sBerryBlender->framesToWait = 0; break; case 1: if (IsLinkTaskFinished()) { - sBerryBlenderData->field_1A0++; + sBerryBlender->linkPlayAgainState++; gSoftResetDisabled = TRUE; } break; case 2: FullSaveGame(); - sBerryBlenderData->field_1A0++; - sBerryBlenderData->framesToWait = 0; + sBerryBlender->linkPlayAgainState++; + sBerryBlender->framesToWait = 0; break; case 3: - if (++sBerryBlenderData->framesToWait == 10) + if (++sBerryBlender->framesToWait == 10) { SetLinkStandbyCallback(); - sBerryBlenderData->field_1A0++; + sBerryBlender->linkPlayAgainState++; } break; case 4: @@ -2615,21 +2794,21 @@ static bool8 LinkPlayAgainHandleSaving(void) { if (CheckSaveFile()) { - sBerryBlenderData->field_1A0 = 5; + sBerryBlender->linkPlayAgainState = 5; } else { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->field_1A0 = 3; + sBerryBlender->framesToWait = 0; + sBerryBlender->linkPlayAgainState = 3; } } break; case 5: - sBerryBlenderData->field_1A0++; - sBerryBlenderData->framesToWait = 0; + sBerryBlender->linkPlayAgainState++; + sBerryBlender->framesToWait = 0; break; case 6: - if (++sBerryBlenderData->framesToWait > 5) + if (++sBerryBlender->framesToWait > 5) { gSoftResetDisabled = FALSE; return TRUE; @@ -2640,113 +2819,115 @@ static bool8 LinkPlayAgainHandleSaving(void) return FALSE; } -static void CB2_HandlePlayerLinkPlayAgainChoice(void) +static void CB2_CheckPlayAgainLink(void) { - switch (sBerryBlenderData->gameEndState) + switch (sBerryBlender->gameEndState) { case 0: - if (sBerryBlenderData->field_64[0] == 0x2222) + if (sBerryBlender->playerContinueResponses[0] == LINKCMD_SEND_LINK_TYPE) { - sBerryBlenderData->gameEndState = 5; + // Link leader says game will continue + sBerryBlender->gameEndState = 5; } - else if (sBerryBlenderData->field_64[0] == 0x1111) + else if (sBerryBlender->playerContinueResponses[0] == LINKCMD_BLENDER_STOP) { - if (sBerryBlenderData->field_6C == 0x9999) - sBerryBlenderData->gameEndState = 2; - else if (sBerryBlenderData->field_6C == 0xAAAA) - sBerryBlenderData->gameEndState = 1; + // Link leader says game will stop, if necessary print why + if (sBerryBlender->canceledPlayerCmd == LINKCMD_BLENDER_NO_BERRIES) + sBerryBlender->gameEndState = 2; + else if (sBerryBlender->canceledPlayerCmd == LINKCMD_BLENDER_NO_PBLOCK_SPACE) + sBerryBlender->gameEndState = 1; else - sBerryBlenderData->gameEndState = 5; + sBerryBlender->gameEndState = 5; } break; case 1: - sBerryBlenderData->gameEndState = 3; - StringCopy(gStringVar4, gLinkPlayers[sBerryBlenderData->field_6E].name); + sBerryBlender->gameEndState = 3; + StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); StringAppend(gStringVar4, sText_ApostropheSPokeblockCaseIsFull); break; case 2: - sBerryBlenderData->gameEndState++; - StringCopy(gStringVar4, gLinkPlayers[sBerryBlenderData->field_6E].name); + sBerryBlender->gameEndState++; + StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); StringAppend(gStringVar4, sText_HasNoBerriesToPut); break; case 3: - if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeedDelay())) + if (Blender_PrintText(&sBerryBlender->textState, gStringVar4, GetPlayerTextSpeedDelay())) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->gameEndState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->gameEndState++; } break; case 4: - if (++sBerryBlenderData->framesToWait > 60) - sBerryBlenderData->gameEndState = 5; + if (++sBerryBlender->framesToWait > 60) + sBerryBlender->gameEndState = 5; break; case 5: - Blender_PrintText(&sBerryBlenderData->textState, gText_SavingDontTurnOff2, 0); + Blender_PrintText(&sBerryBlender->textState, gText_SavingDontTurnOff2, 0); SetLinkStandbyCallback(); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; break; case 6: if (IsLinkTaskFinished()) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->gameEndState++; - sBerryBlenderData->field_1A0 = 0; + sBerryBlender->framesToWait = 0; + sBerryBlender->gameEndState++; + sBerryBlender->linkPlayAgainState = 0; } break; case 7: if (LinkPlayAgainHandleSaving()) { PlaySE(SE_SAVE); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } break; case 8: - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; SetLinkStandbyCallback(); break; case 9: if (IsLinkTaskFinished()) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } break; case 10: if (!gPaletteFade.active) { - if (sBerryBlenderData->field_64[0] == 0x2222) + if (sBerryBlender->playerContinueResponses[0] == LINKCMD_SEND_LINK_TYPE) { FreeAllWindowBuffers(); UnsetBgTilemapBuffer(2); UnsetBgTilemapBuffer(1); - FREE_AND_SET_NULL(sBerryBlenderData); + FREE_AND_SET_NULL(sBerryBlender); SetMainCallback2(DoBerryBlending); } else { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->gameEndState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->gameEndState++; } } break; case 11: - if (++sBerryBlenderData->framesToWait > 30) + if (++sBerryBlender->framesToWait > 30) { SetCloseLinkCallback(); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; } break; case 12: - if (gReceivedRemoteLinkPlayers == 0) + if (!gReceivedRemoteLinkPlayers) { - FREE_AND_SET_NULL(sBerryBlenderData); + FREE_AND_SET_NULL(sBerryBlender); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } break; } - sub_8082AD4(); - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + ProcessLinkPlayerCmds(); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -2754,40 +2935,40 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) UpdatePaletteFade(); } -static void CB2_HandlePlayerPlayAgainChoice(void) +static void CB2_CheckPlayAgainLocal(void) { - switch (sBerryBlenderData->gameEndState) + switch (sBerryBlender->gameEndState) { case 0: - if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK || sBerryBlenderData->playAgainState == DONT_PLAY_AGAIN) - sBerryBlenderData->gameEndState = 9; - if (sBerryBlenderData->playAgainState == CANT_PLAY_NO_BERRIES) - sBerryBlenderData->gameEndState = 2; - if (sBerryBlenderData->playAgainState == CANT_PLAY_NO_PKBLCK_SPACE) - sBerryBlenderData->gameEndState = 1; + if (sBerryBlender->playAgainState == PLAY_AGAIN_YES || sBerryBlender->playAgainState == PLAY_AGAIN_NO) + sBerryBlender->gameEndState = 9; + if (sBerryBlender->playAgainState == CANT_PLAY_NO_BERRIES) + sBerryBlender->gameEndState = 2; + if (sBerryBlender->playAgainState == CANT_PLAY_NO_PKBLCK_SPACE) + sBerryBlender->gameEndState = 1; break; case 1: - sBerryBlenderData->gameEndState = 3; - sBerryBlenderData->textState = 0; + sBerryBlender->gameEndState = 3; + sBerryBlender->textState = 0; StringCopy(gStringVar4, sText_YourPokeblockCaseIsFull); break; case 2: - sBerryBlenderData->gameEndState++; - sBerryBlenderData->textState = 0; + sBerryBlender->gameEndState++; + sBerryBlender->textState = 0; StringCopy(gStringVar4, sText_RunOutOfBerriesForBlending); break; case 3: - if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeedDelay())) - sBerryBlenderData->gameEndState = 9; + if (Blender_PrintText(&sBerryBlender->textState, gStringVar4, GetPlayerTextSpeedDelay())) + sBerryBlender->gameEndState = 9; break; case 9: BeginFastPaletteFade(3); - sBerryBlenderData->gameEndState++; + sBerryBlender->gameEndState++; break; case 10: if (!gPaletteFade.active) { - if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK) + if (sBerryBlender->playAgainState == PLAY_AGAIN_YES) SetMainCallback2(DoBerryBlending); else SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); @@ -2795,13 +2976,13 @@ static void CB2_HandlePlayerPlayAgainChoice(void) FreeAllWindowBuffers(); UnsetBgTilemapBuffer(2); UnsetBgTilemapBuffer(1); - FREE_AND_SET_NULL(sBerryBlenderData); + FREE_AND_SET_NULL(sBerryBlender); } break; } - sub_8082AD4(); - Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y); + ProcessLinkPlayerCmds(); + Blender_DummiedOutFunc(sBerryBlender->bg_X, sBerryBlender->bg_Y); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -2809,152 +2990,169 @@ static void CB2_HandlePlayerPlayAgainChoice(void) UpdatePaletteFade(); } -static void sub_8082AD4(void) +static void ProcessLinkPlayerCmds(void) { if (gReceivedRemoteLinkPlayers) { - if (sub_80814B0(gRecvCmds[0][0], 0x2FFF, 0x2F00)) + if (CheckRecvCmdMatches(gRecvCmds[0][BLENDER_COMM_INPUT_STATE], LINKCMD_SEND_PACKET, RFUCMD_SEND_PACKET)) { - if (gRecvCmds[0][1] == 0x1111) + if (gRecvCmds[0][BLENDER_COMM_RESP] == LINKCMD_BLENDER_STOP) { - switch (gRecvCmds[0][2]) + // Link leader has indicated play is stopping, read signal to determine why + switch (gRecvCmds[0][BLENDER_COMM_STOP_TYPE]) { - case 0x8888: - sBerryBlenderData->field_6C = 0x8888; - sBerryBlenderData->field_6E = gRecvCmds[0][3]; + case LINKCMD_CONT_BLOCK: // Someone selected "No" to continue playing + sBerryBlender->canceledPlayerCmd = LINKCMD_CONT_BLOCK; + sBerryBlender->canceledPlayerId = gRecvCmds[0][BLENDER_COMM_PLAYER_ID]; break; - case 0x9999: - sBerryBlenderData->field_6C = 0x9999; - sBerryBlenderData->field_6E = gRecvCmds[0][3]; + case LINKCMD_BLENDER_NO_BERRIES: + sBerryBlender->canceledPlayerCmd = LINKCMD_BLENDER_NO_BERRIES; + sBerryBlender->canceledPlayerId = gRecvCmds[0][BLENDER_COMM_PLAYER_ID]; break; - case 0xAAAA: - sBerryBlenderData->field_6C = 0xAAAA; - sBerryBlenderData->field_6E = gRecvCmds[0][3]; + case LINKCMD_BLENDER_NO_PBLOCK_SPACE: + sBerryBlender->canceledPlayerCmd = LINKCMD_BLENDER_NO_PBLOCK_SPACE; + sBerryBlender->canceledPlayerId = gRecvCmds[0][BLENDER_COMM_PLAYER_ID]; break; } - sBerryBlenderData->field_64[0] = 0x1111; + sBerryBlender->playerContinueResponses[0] = LINKCMD_BLENDER_STOP; } - else if (gRecvCmds[0][1] == 0x2222) + else if (gRecvCmds[0][BLENDER_COMM_RESP] == LINKCMD_SEND_LINK_TYPE) { - sBerryBlenderData->field_64[0] = 0x2222; + // Link leader has indicated play will continue + sBerryBlender->playerContinueResponses[0] = LINKCMD_SEND_LINK_TYPE; } } - if (GetMultiplayerId() == 0 && sBerryBlenderData->field_64[0] != 0x1111 && sBerryBlenderData->field_64[0] != 0x2222) + + // If player is link leader, check for responses to the "Continue playing" prompt (even if it's not up yet) + if (GetMultiplayerId() == 0 + && sBerryBlender->playerContinueResponses[0] != LINKCMD_BLENDER_STOP + && sBerryBlender->playerContinueResponses[0] != LINKCMD_SEND_LINK_TYPE) { u8 i; + + // Try to gather responses for (i = 0; i < GetLinkPlayerCount(); i++) { - if (sub_80814B0(gRecvCmds[i][0], 0x2FFF, 0x2F00)) + if (CheckRecvCmdMatches(gRecvCmds[i][BLENDER_COMM_INPUT_STATE], LINKCMD_SEND_PACKET, RFUCMD_SEND_PACKET)) { - switch (gRecvCmds[i][1]) + switch (gRecvCmds[i][BLENDER_COMM_RESP]) { - case 0x8888: - sBerryBlenderData->field_64[i] = 0x8888; + case LINKCMD_CONT_BLOCK: // Selected "No" + sBerryBlender->playerContinueResponses[i] = LINKCMD_CONT_BLOCK; break; - case 0x7779: - sBerryBlenderData->field_64[i] = 0x7779; + case LINKCMD_BLENDER_PLAY_AGAIN: // Selected "Yes" + sBerryBlender->playerContinueResponses[i] = LINKCMD_BLENDER_PLAY_AGAIN; break; - case 0x9999: - sBerryBlenderData->field_64[i] = 0x9999; + case LINKCMD_BLENDER_NO_BERRIES: + sBerryBlender->playerContinueResponses[i] = LINKCMD_BLENDER_NO_BERRIES; break; - case 0xAAAA: - sBerryBlenderData->field_64[i] = 0xAAAA; + case LINKCMD_BLENDER_NO_PBLOCK_SPACE: + sBerryBlender->playerContinueResponses[i] = LINKCMD_BLENDER_NO_PBLOCK_SPACE; break; } } } + + // Count players that have responded, stopping at first non-response for (i = 0; i < GetLinkPlayerCount(); i++) { - if (sBerryBlenderData->field_64[i] == 0) + if (sBerryBlender->playerContinueResponses[i] == 0) break; } + + // If all players responded, handle response if (i == GetLinkPlayerCount()) { + // Count players that decided to play again, stopping at first negative response for (i = 0; i < GetLinkPlayerCount(); i++) { - if (sBerryBlenderData->field_64[i] != 0x7779) + if (sBerryBlender->playerContinueResponses[i] != LINKCMD_BLENDER_PLAY_AGAIN) break; } - sub_8081F94(&gSendCmd[0]); + + // Schedule signal to other players about whether or not play will continue + SendContinuePromptResponse(&gSendCmd[BLENDER_COMM_INPUT_STATE]); if (i == GetLinkPlayerCount()) { - gSendCmd[1] = 0x2222; + // All players chose to continue playing + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_SEND_LINK_TYPE; } else { - gSendCmd[1] = 0x1111; - gSendCmd[2] = sBerryBlenderData->field_64[i]; - gSendCmd[3] = i; + // At least 1 player decided to stop playing, or can't continue playing + gSendCmd[BLENDER_COMM_RESP] = LINKCMD_BLENDER_STOP; + gSendCmd[BLENDER_COMM_STOP_TYPE] = sBerryBlender->playerContinueResponses[i]; + gSendCmd[BLENDER_COMM_PLAYER_ID] = i; } } } } } -static void sub_8082CB4(struct BgAffineSrcData *dest) +static void DrawBlenderCenter(struct BgAffineSrcData *dest) { struct BgAffineSrcData affineSrc; affineSrc.texX = 0x7800; affineSrc.texY = 0x5000; - affineSrc.scrX = 0x78 - sBerryBlenderData->bg_X; - affineSrc.scrY = 0x50 - sBerryBlenderData->bg_Y; - affineSrc.sx = sBerryBlenderData->field_11A; - affineSrc.sy = sBerryBlenderData->field_11A; - affineSrc.alpha = sBerryBlenderData->arrowPos; + affineSrc.scrX = 0x78 - sBerryBlender->bg_X; + affineSrc.scrY = 0x50 - sBerryBlender->bg_Y; + affineSrc.sx = sBerryBlender->centerScale; + affineSrc.sy = sBerryBlender->centerScale; + affineSrc.alpha = sBerryBlender->arrowPos; *dest = affineSrc; } u16 GetBlenderArrowPosition(void) { - return sBerryBlenderData->arrowPos; + return sBerryBlender->arrowPos; } -static void sub_8082D28(void) +static void UpdateBlenderCenter(void) { u8 playerId = 0; - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) playerId = GetMultiplayerId(); - if (gWirelessCommType && gReceivedRemoteLinkPlayers != 0) + if (gWirelessCommType && gReceivedRemoteLinkPlayers) { if (playerId == 0) { - sBerryBlenderData->arrowPos += sBerryBlenderData->field_4C; - gSendCmd[5] = sBerryBlenderData->field_116; - gSendCmd[6] = sBerryBlenderData->arrowPos; - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + sBerryBlender->arrowPos += sBerryBlender->speed; + gSendCmd[BLENDER_COMM_PROGRESS_BAR] = sBerryBlender->progressBarValue; + gSendCmd[BLENDER_COMM_ARROW_POS] = sBerryBlender->arrowPos; + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); } else { - if ((gRecvCmds[0][0] & 0xFF00) == 0x4400) + if ((gRecvCmds[0][BLENDER_COMM_INPUT_STATE] & 0xFF00) == RFUCMD_BLENDER_SEND_KEYS) { - sBerryBlenderData->field_116 = gRecvCmds[0][5]; - sBerryBlenderData->arrowPos = gRecvCmds[0][6]; - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + sBerryBlender->progressBarValue = gRecvCmds[0][BLENDER_COMM_PROGRESS_BAR]; + sBerryBlender->arrowPos = gRecvCmds[0][BLENDER_COMM_ARROW_POS]; + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); } } } else { - sBerryBlenderData->arrowPos += sBerryBlenderData->field_4C; - sub_8082CB4(&sBerryBlenderData->bgAffineSrc); + sBerryBlender->arrowPos += sBerryBlender->speed; + DrawBlenderCenter(&sBerryBlender->bgAffineSrc); } } -static void BerryBlender_SetBackgroundsPos(void) +static void SetBgPos(void) { - SetGpuReg(REG_OFFSET_BG1HOFS, sBerryBlenderData->bg_X); - SetGpuReg(REG_OFFSET_BG1VOFS, sBerryBlenderData->bg_Y); + SetGpuReg(REG_OFFSET_BG1HOFS, sBerryBlender->bg_X); + SetGpuReg(REG_OFFSET_BG1VOFS, sBerryBlender->bg_Y); - SetGpuReg(REG_OFFSET_BG0HOFS, sBerryBlenderData->bg_X); - SetGpuReg(REG_OFFSET_BG0VOFS, sBerryBlenderData->bg_Y); + SetGpuReg(REG_OFFSET_BG0HOFS, sBerryBlender->bg_X); + SetGpuReg(REG_OFFSET_BG0VOFS, sBerryBlender->bg_Y); } -static void sub_8082E3C(struct Sprite* sprite) +static void SpriteCB_Particle(struct Sprite* sprite) { sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; @@ -2965,7 +3163,7 @@ static void sub_8082E3C(struct Sprite* sprite) DestroySprite(sprite); } -static void sub_8082E84(void) +static void CreateParticleSprites(void) { s32 limit = (Random() % 2) + 1; s32 i; @@ -2976,20 +3174,20 @@ static void sub_8082E84(void) s32 x, y; u8 spriteId; - rand = sBerryBlenderData->arrowPos + (Random() % 20); + rand = sBerryBlender->arrowPos + (Random() % 20); x = gSineTable[(rand & 0xFF) + 64] / 4; y = gSineTable[(rand & 0xFF)] / 4; - spriteId = CreateSprite(&sUnknown_08339BE0, x + 120, y + 80, 1); + spriteId = CreateSprite(&sSpriteTemplate_Particles, x + 120, y + 80, 1); gSprites[spriteId].data[0] = 16 - (Random() % 32); gSprites[spriteId].data[1] = 16 - (Random() % 32); - gSprites[spriteId].callback = sub_8082E3C; + gSprites[spriteId].callback = SpriteCB_Particle; } } -static void sub_8082F68(struct Sprite* sprite) +static void SpriteCB_ScoreSymbol(struct Sprite* sprite) { sprite->data[0]++; sprite->pos2.y = -(sprite->data[0] / 3); @@ -2998,7 +3196,7 @@ static void sub_8082F68(struct Sprite* sprite) DestroySprite(sprite); } -static void sub_8082F9C(struct Sprite* sprite) +static void SpriteCB_ScoreSymbolBest(struct Sprite* sprite) { sprite->data[0]++; sprite->pos2.y = -(sprite->data[0] * 2); @@ -3009,56 +3207,65 @@ static void sub_8082F9C(struct Sprite* sprite) DestroySprite(sprite); } -static void Blender_SetParticipantBerryData(u8 participantId, u16 itemId) +static void SetPlayerBerryData(u8 playerId, u16 itemId) { - sBerryBlenderData->chosenItemId[participantId] = itemId; - Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[participantId], itemId); + sBerryBlender->chosenItemId[playerId] = itemId; + ConvertItemToBlenderBerry(&sBerryBlender->blendedBerries[playerId], itemId); } -static void sub_8083010(struct Sprite* sprite) +#define sState data[0] +#define sYPos data[1] +#define sDelay data[2] +#define sAnimId data[3] + +static void SpriteCB_CountdownNumber(struct Sprite* sprite) { - switch (sprite->data[0]) + switch (sprite->sState) { case 0: - sprite->data[1] += 8; - if (sprite->data[1] > 88) + sprite->sYPos += 8; + if (sprite->sYPos > DISPLAY_HEIGHT / 2 + 8) { - sprite->data[1] = 88; - sprite->data[0]++; - PlaySE(SE_KON); + sprite->sYPos = DISPLAY_HEIGHT / 2 + 8; + sprite->sState++; + PlaySE(SE_BALL_BOUNCE_1); } break; case 1: - sprite->data[2] += 1; - if (sprite->data[2] > 20) + if (++sprite->sDelay > 20) { - sprite->data[0]++; - sprite->data[2] = 0; + sprite->sState++; + sprite->sDelay = 0; } break; case 2: - sprite->data[1] += 4; - if (sprite->data[1] > 176) + sprite->sYPos += 4; + if (sprite->sYPos > DISPLAY_HEIGHT + 16) { - if (++sprite->data[3] == 3) + if (++sprite->sAnimId == 3) { DestroySprite(sprite); - CreateSprite(&sUnknown_08339C60, 120, -20, 2); + CreateSprite(&sSpriteTemplate_Start, 120, -20, 2); } else { - sprite->data[0] = 0; - sprite->data[1] = -16; - StartSpriteAnim(sprite, sprite->data[3]); + sprite->sState = 0; + sprite->sYPos = -16; + StartSpriteAnim(sprite, sprite->sAnimId); } } break; } - sprite->pos2.y = sprite->data[1]; + sprite->pos2.y = sprite->sYPos; } -static void sub_80830C0(struct Sprite* sprite) +#undef sState +#undef sYPos +#undef sDelay +#undef sAnimId + +static void SpriteCB_Start(struct Sprite* sprite) { switch (sprite->data[0]) { @@ -3078,9 +3285,9 @@ static void sub_80830C0(struct Sprite* sprite) break; case 2: sprite->data[1] += 4; - if (sprite->data[1] > 176) + if (sprite->data[1] > DISPLAY_HEIGHT + 16) { - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; DestroySprite(sprite); } break; @@ -3089,175 +3296,190 @@ static void sub_80830C0(struct Sprite* sprite) sprite->pos2.y = sprite->data[1]; } -static void sub_8083140(u16 a0, u16 a1) +static void TryUpdateProgressBar(u16 current, u16 limit) { - if (sBerryBlenderData->field_118 < a0) + // Progress bar doesn't move unless it's going up + if (sBerryBlender->maxProgressBarValue < current) { - sBerryBlenderData->field_118 += 2; - sub_8083170(sBerryBlenderData->field_118, a1); + sBerryBlender->maxProgressBarValue += 2; + UpdateProgressBar(sBerryBlender->maxProgressBarValue, limit); } } -static void sub_8083170(u16 a0, u16 a1) +static void UpdateProgressBar(u16 value, u16 limit) { - s32 var1, var2, var3, var4; + s32 amountFilled, maxFilledSegment, subSegmentsFilled, i; u16 *vram; vram = (u16*)(BG_SCREEN_ADDR(12)); - var1 = (a0 * 64) / a1; - var2 = var1 / 8; - for (var4 = 0; var4 < var2; var4++) + amountFilled = (value * 64) / limit; + maxFilledSegment = amountFilled / 8; + + // Set filled progress bar tiles in full segments + for (i = 0; i < maxFilledSegment; i++) { - vram[11 + var4] = 0x80E9; - vram[43 + var4] = 0x80F9; + vram[11 + i] = PROGRESS_BAR_FILLED_TOP; + vram[43 + i] = PROGRESS_BAR_FILLED_BOTTOM; } - var3 = var1 % 8; - if (var3 != 0) + + // If progress bar between segments, fill with the corresponding partial segment tiles + subSegmentsFilled = amountFilled % 8; + if (subSegmentsFilled != 0) { - vram[11 + var4] = var3 + 0x80E1; - vram[43 + var4] = var3 + 0x80F1; - var4++; + vram[11 + i] = subSegmentsFilled + PROGRESS_BAR_EMPTY_TOP; + vram[43 + i] = subSegmentsFilled + PROGRESS_BAR_EMPTY_BOTTOM; + i++; } - for (; var4 < 8; var4++) + + // Fill the remaining full segments with empty progress tiles + // Essentially unnecessary, given that it starts empty and progress only goes up + for (; i < 8; i++) { - vram[11 + var4] = 0x80E1; - vram[43 + var4] = 0x80F1; + vram[11 + i] = PROGRESS_BAR_EMPTY_TOP; + vram[43 + i] = PROGRESS_BAR_EMPTY_BOTTOM; } } -static u32 sub_8083210(u16 a0) +static u32 ArrowSpeedToRPM(u16 speed) { - return 0x57E40 * a0 / 0x10000; + return 60 * 60 * 100 * speed / MAX_ARROW_POS; } -static void sub_8083230(u16 a0) +static void UpdateRPM(u16 speed) { u8 i; - u8 palAdders[5]; + u8 digits[5]; - u32 var = sub_8083210(a0); - if (sBerryBlenderData->max_RPM < var) - sBerryBlenderData->max_RPM = var; + // Check if new max RPM has been reached + u32 currentRPM = ArrowSpeedToRPM(speed); + if (sBerryBlender->maxRPM < currentRPM) + sBerryBlender->maxRPM = currentRPM; + + // Draw the current RPM number at the bottom of the screen for (i = 0; i < 5; i++) { - palAdders[i] = var % 10; - var /= 10; + digits[i] = currentRPM % 10; + currentRPM /= 10; } - *((u16*)(VRAM + 0x6458)) = palAdders[4] + 0x8072; - *((u16*)(VRAM + 0x645A)) = palAdders[3] + 0x8072; - *((u16*)(VRAM + 0x645C)) = palAdders[2] + 0x8072; - *((u16*)(VRAM + 0x6460)) = palAdders[1] + 0x8072; - *((u16*)(VRAM + 0x6462)) = palAdders[0] + 0x8072; + *((u16*)(BG_SCREEN_ADDR(12) + 0x458)) = digits[4] + RPM_DIGIT; + *((u16*)(BG_SCREEN_ADDR(12) + 0x45A)) = digits[3] + RPM_DIGIT; + *((u16*)(BG_SCREEN_ADDR(12) + 0x45C)) = digits[2] + RPM_DIGIT; + *((u16*)(BG_SCREEN_ADDR(12) + 0x460)) = digits[1] + RPM_DIGIT; + *((u16*)(BG_SCREEN_ADDR(12) + 0x462)) = digits[0] + RPM_DIGIT; } -static void sub_80832BC(s16* a0, u16 a1) +// Passed a pointer to the bg x/y +// Used when hitting a Best at high RPM +static void ShakeBgCoordForHit(s16* coord, u16 speed) { - if (*a0 == 0) - *a0 = (Random() % a1) - (a1 / 2); + if (*coord == 0) + *coord = (Random() % speed) - (speed / 2); } -static void sub_80832E8(s16* a0) +static void RestoreBgCoord(s16* coord) { - if (*a0 < 0) - (*a0)++; - if (*a0 > 0) - (*a0)--; + if (*coord < 0) + (*coord)++; + if (*coord > 0) + (*coord)--; } -static void sub_808330C(void) +// For "unshaking" the screen after ShakeBgCoordForHit is called +static void RestoreBgCoords(void) { - sub_80832E8((s16 *)&sBerryBlenderData->bg_X); - sub_80832E8((s16 *)&sBerryBlenderData->bg_Y); + RestoreBgCoord((s16 *)&sBerryBlender->bg_X); + RestoreBgCoord((s16 *)&sBerryBlender->bg_Y); } -static void sub_8083334(s16* a0, u16 a1) +static void BlenderLandShakeBgCoord(s16* coord, u16 timer) { - u8 var; + u8 strength; - if (a1 < 10) - var = 16; + if (timer < 10) + strength = 16; else - var = 8; + strength = 8; - if (*a0 == 0) + if (*coord == 0) { - *a0 = (Random() % var) - (var / 2); + *coord = (Random() % strength) - (strength / 2); } else { - if (*a0 < 0) - (*a0)++; - if (*a0 > 0) - (*a0)--; + if (*coord < 0) + (*coord)++; + if (*coord > 0) + (*coord)--; } } -static bool8 sub_8083380(void) +// For shaking the screen when the blender lands after falling in at the start +static bool8 UpdateBlenderLandScreenShake(void) { - if (sBerryBlenderData->framesToWait == 0) + if (sBerryBlender->framesToWait == 0) { - sBerryBlenderData->bg_X = 0; - sBerryBlenderData->bg_Y = 0; + sBerryBlender->bg_X = 0; + sBerryBlender->bg_Y = 0; } - sBerryBlenderData->framesToWait++; - sub_8083334(&sBerryBlenderData->bg_X, sBerryBlenderData->framesToWait); - sub_8083334(&sBerryBlenderData->bg_Y, sBerryBlenderData->framesToWait); + sBerryBlender->framesToWait++; + BlenderLandShakeBgCoord(&sBerryBlender->bg_X, sBerryBlender->framesToWait); + BlenderLandShakeBgCoord(&sBerryBlender->bg_Y, sBerryBlender->framesToWait); - if (sBerryBlenderData->framesToWait == 20) + if (sBerryBlender->framesToWait == 20) { - sBerryBlenderData->bg_X = 0; - sBerryBlenderData->bg_Y = 0; + sBerryBlender->bg_X = 0; + sBerryBlender->bg_Y = 0; return TRUE; } return FALSE; } -static void sub_80833F8(struct Sprite* sprite) +static void SpriteCB_PlayerArrow(struct Sprite* sprite) { - sprite->pos2.x = -(sBerryBlenderData->bg_X); - sprite->pos2.y = -(sBerryBlenderData->bg_Y); + sprite->pos2.x = -(sBerryBlender->bg_X); + sprite->pos2.y = -(sBerryBlender->bg_Y); } static void TryUpdateBerryBlenderRecord(void) { - if (gSaveBlock1Ptr->berryBlenderRecords[sBerryBlenderData->playersNo - 2] < sBerryBlenderData->max_RPM) - gSaveBlock1Ptr->berryBlenderRecords[sBerryBlenderData->playersNo - 2] = sBerryBlenderData->max_RPM; + if (gSaveBlock1Ptr->berryBlenderRecords[sBerryBlender->numPlayers - 2] < sBerryBlender->maxRPM) + gSaveBlock1Ptr->berryBlenderRecords[sBerryBlender->numPlayers - 2] = sBerryBlender->maxRPM; } -static bool8 Blender_PrintBlendingResults(void) +static bool8 PrintBlendingResults(void) { u16 i; s32 xPos, yPos; struct Pokeblock pokeblock; - u8 flavors[6]; + u8 flavors[FLAVOR_COUNT + 1]; u8 text[40]; u16 berryIds[4]; // unused - switch (sBerryBlenderData->mainState) + switch (sBerryBlender->mainState) { case 0: - sBerryBlenderData->mainState++; - sBerryBlenderData->framesToWait = 17; + sBerryBlender->mainState++; + sBerryBlender->framesToWait = 17; break; case 1: - sBerryBlenderData->framesToWait -= 10; - if (sBerryBlenderData->framesToWait < 0) + sBerryBlender->framesToWait -= 10; + if (sBerryBlender->framesToWait < 0) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; } break; case 2: - if (++sBerryBlenderData->framesToWait > 20) + if (++sBerryBlender->framesToWait > 20) { - for (i = 0; i < BLENDER_SCORES_NO; i++) - DestroySprite(&gSprites[sBerryBlenderData->scoreIconIds[i]]); + for (i = 0; i < NUM_SCORE_TYPES; i++) + DestroySprite(&gSprites[sBerryBlender->scoreIconIds[i]]); - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; } break; case 3: @@ -3268,92 +3490,91 @@ static bool8 Blender_PrintBlendingResults(void) xPos = GetStringCenterAlignXOffset(1, sText_BlendingResults, 0xA8); Blender_AddTextPrinter(5, sText_BlendingResults, xPos, 1, TEXT_SPEED_FF, 0); - if (sBerryBlenderData->playersNo == 4) + if (sBerryBlender->numPlayers == BLENDER_MAX_PLAYERS) yPos = 17; else yPos = 21; - for (i = 0; i < sBerryBlenderData->playersNo; yPos += 16, i++) + for (i = 0; i < sBerryBlender->numPlayers; yPos += 16, i++) { - u8 place = sBerryBlenderData->playerPlaces[i]; + u8 place = sBerryBlender->playerPlaces[i]; - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1); - StringAppend(sBerryBlenderData->stringVar, sText_Dot); - StringAppend(sBerryBlenderData->stringVar, gText_Space); - StringAppend(sBerryBlenderData->stringVar, gLinkPlayers[place].name); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 8, yPos, TEXT_SPEED_FF, 3); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1); + StringAppend(sBerryBlender->stringVar, sText_Dot); + StringAppend(sBerryBlender->stringVar, gText_Space); + StringAppend(sBerryBlender->stringVar, gLinkPlayers[place].name); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 8, yPos, TEXT_SPEED_FF, 3); - StringCopy(sBerryBlenderData->stringVar, sBerryBlenderData->blendedBerries[place].name); - ConvertInternationalString(sBerryBlenderData->stringVar, gLinkPlayers[place].language); - StringAppend(sBerryBlenderData->stringVar, sText_SpaceBerry); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x54, yPos, TEXT_SPEED_FF, 3); + StringCopy(sBerryBlender->stringVar, sBerryBlender->blendedBerries[place].name); + ConvertInternationalString(sBerryBlender->stringVar, gLinkPlayers[place].language); + StringAppend(sBerryBlender->stringVar, sText_SpaceBerry); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 0x54, yPos, TEXT_SPEED_FF, 3); } Blender_AddTextPrinter(5, sText_MaximumSpeed, 0, 0x51, TEXT_SPEED_FF, 3); - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->max_RPM / 100, STR_CONV_MODE_RIGHT_ALIGN, 3); - StringAppend(sBerryBlenderData->stringVar, sText_Dot); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, sBerryBlender->maxRPM / 100, STR_CONV_MODE_RIGHT_ALIGN, 3); + StringAppend(sBerryBlender->stringVar, sText_Dot); - ConvertIntToDecimalStringN(text, sBerryBlenderData->max_RPM % 100, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(sBerryBlenderData->stringVar, text); - StringAppend(sBerryBlenderData->stringVar, sText_RPM); + ConvertIntToDecimalStringN(text, sBerryBlender->maxRPM % 100, STR_CONV_MODE_LEADING_ZEROS, 2); + StringAppend(sBerryBlender->stringVar, text); + StringAppend(sBerryBlender->stringVar, sText_RPM); - xPos = GetStringRightAlignXOffset(1, sBerryBlenderData->stringVar, 0xA8); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, xPos, 0x51, TEXT_SPEED_FF, 3); + xPos = GetStringRightAlignXOffset(1, sBerryBlender->stringVar, 0xA8); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, xPos, 0x51, TEXT_SPEED_FF, 3); Blender_AddTextPrinter(5, sText_Time, 0, 0x61, TEXT_SPEED_FF, 3); - seconds = (sBerryBlenderData->gameFrameTime / 60) % 60; - minutes = (sBerryBlenderData->gameFrameTime / (60 * 60)); + seconds = (sBerryBlender->gameFrameTime / 60) % 60; + minutes = (sBerryBlender->gameFrameTime / (60 * 60)); - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); - txtPtr = StringAppend(sBerryBlenderData->stringVar, sText_Min); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); + txtPtr = StringAppend(sBerryBlender->stringVar, sText_Min); ConvertIntToDecimalStringN(txtPtr, seconds, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(sBerryBlenderData->stringVar, sText_Sec); + StringAppend(sBerryBlender->stringVar, sText_Sec); - xPos = GetStringRightAlignXOffset(1, sBerryBlenderData->stringVar, 0xA8); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, xPos, 0x61, TEXT_SPEED_FF, 3); + xPos = GetStringRightAlignXOffset(1, sBerryBlender->stringVar, 0xA8); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, xPos, 0x61, TEXT_SPEED_FF, 3); - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; CopyWindowToVram(5, 2); } break; case 4: - if (gMain.newKeys & A_BUTTON) - sBerryBlenderData->mainState++; + if (JOY_NEW(A_BUTTON)) + sBerryBlender->mainState++; break; case 5: ClearStdWindowAndFrameToTransparent(5, 1); for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->chosenItemId[i] != 0) - berryIds[i] = sBerryBlenderData->chosenItemId[i] - FIRST_BERRY_INDEX; - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlender->chosenItemId[i] != 0) + berryIds[i] = sBerryBlender->chosenItemId[i] - FIRST_BERRY_INDEX; + if (sBerryBlender->arrowIdToPlayerId[i] != NO_PLAYER) { PutWindowTilemap(i); CopyWindowToVram(i, 3); } } - sub_8081E20(); + Debug_SetStageVars(); + CalculatePokeblock(sBerryBlender->blendedBerries, &pokeblock, sBerryBlender->numPlayers, flavors, sBerryBlender->maxRPM); + PrintMadePokeblockString(&pokeblock, sBerryBlender->stringVar); + TryAddContestLinkTvShow(&pokeblock, &sBerryBlender->tvBlender); - Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavors, sBerryBlenderData->max_RPM); - Blender_PrintMadePokeblockString(&pokeblock, sBerryBlenderData->stringVar); - TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender); - - CreateTask(sub_8083F3C, 6); + CreateTask(Task_PlayPokeblockFanfare, 6); IncrementDailyBerryBlender(); RemoveBagItem(gSpecialVar_ItemId, 1); AddPokeblock(&pokeblock); - sBerryBlenderData->textState = 0; - sBerryBlenderData->mainState++; + sBerryBlender->textState = 0; + sBerryBlender->mainState++; break; case 6: - if (Blender_PrintText(&sBerryBlenderData->textState, sBerryBlenderData->stringVar, GetPlayerTextSpeedDelay())) + if (Blender_PrintText(&sBerryBlender->textState, sBerryBlender->stringVar, GetPlayerTextSpeedDelay())) { TryUpdateBerryBlenderRecord(); return TRUE; @@ -3364,7 +3585,7 @@ static bool8 Blender_PrintBlendingResults(void) return FALSE; } -static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) +static void PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) { u8 text[12]; u8 flavorLvl, feel; @@ -3389,7 +3610,7 @@ static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *ds StringAppend(dst, sText_NewParagraph); } -static void Blender_SortBasedOnPoints(u8 *places, u8 playersNum, u32 *scores) +static void SortBasedOnPoints(u8 *places, u8 playersNum, u32 *scores) { s32 i, j; @@ -3399,128 +3620,128 @@ static void Blender_SortBasedOnPoints(u8 *places, u8 playersNum, u32 *scores) { if (scores[places[i]] > scores[places[j]]) { - u8 temp = places[i]; - places[i] = places[j]; - places[j] = temp; + u8 temp; + SWAP(places[i], places[j], temp); } } } } -static void Blender_SortScores(void) +static void SortScores(void) { u8 playerId; u8 i; u8 places[BLENDER_MAX_PLAYERS]; u32 points[BLENDER_MAX_PLAYERS]; - for (i = 0; i < sBerryBlenderData->playersNo; i++) + for (i = 0; i < sBerryBlender->numPlayers; i++) places[i] = i; - for (i = 0; i < sBerryBlenderData->playersNo; i++) + for (i = 0; i < sBerryBlender->numPlayers; i++) { - points[i] = 1000000 * sBerryBlenderData->scores[i][BLENDER_SCORE_BEST]; - points[i] += 1000 * sBerryBlenderData->scores[i][BLENDER_SCORE_GOOD]; - points[i] += 1000 - sBerryBlenderData->scores[i][BLENDER_SCORE_MISS]; + points[i] = 1000000 * sBerryBlender->scores[i][SCORE_BEST]; + points[i] += 1000 * sBerryBlender->scores[i][SCORE_GOOD]; + points[i] += 1000 - sBerryBlender->scores[i][SCORE_MISS]; } - Blender_SortBasedOnPoints(places, sBerryBlenderData->playersNo, points); - for (i = 0; i < sBerryBlenderData->playersNo; i++) - sBerryBlenderData->playerPlaces[i] = places[i]; + SortBasedOnPoints(places, sBerryBlender->numPlayers, points); + for (i = 0; i < sBerryBlender->numPlayers; i++) + sBerryBlender->playerPlaces[i] = places[i]; - if (gReceivedRemoteLinkPlayers == 0) + if (!gReceivedRemoteLinkPlayers) playerId = 0; else playerId = GetMultiplayerId(); - for (i = 0; i < sBerryBlenderData->playersNo; i++) + for (i = 0; i < sBerryBlender->numPlayers; i++) { - if (sBerryBlenderData->playerPlaces[i] == playerId) - sBerryBlenderData->field_1A4 = i; + if (sBerryBlender->playerPlaces[i] == playerId) + sBerryBlender->ownRanking = i; } } -static bool8 Blender_PrintBlendingRanking(void) +static bool8 PrintBlendingRanking(void) { u16 i; s32 xPos, yPos; - switch (sBerryBlenderData->mainState) + switch (sBerryBlender->mainState) { case 0: - sBerryBlenderData->mainState++; - sBerryBlenderData->framesToWait = 255; + sBerryBlender->mainState++; + sBerryBlender->framesToWait = 255; break; case 1: - sBerryBlenderData->framesToWait -= 10; - if (sBerryBlenderData->framesToWait < 0) + sBerryBlender->framesToWait -= 10; + if (sBerryBlender->framesToWait < 0) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; } break; case 2: - if (++sBerryBlenderData->framesToWait > 20) + if (++sBerryBlender->framesToWait > 20) { - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; } break; case 3: DrawStdFrameWithCustomTileAndPalette(5, 0, 1, 0xD); - xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 0xA8); + xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 168); Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SPEED_FF, 0); - sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST] = CreateSprite(&sUnknown_08339B40, 128, 52, 0); - StartSpriteAnim(&gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST]], 3); - gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST]].callback = SpriteCallbackDummy; + sBerryBlender->scoreIconIds[SCORE_BEST] = CreateSprite(&sSpriteTemplate_ScoreSymbols, 128, 52, 0); + StartSpriteAnim(&gSprites[sBerryBlender->scoreIconIds[SCORE_BEST]], SCOREANIM_BEST_STATIC); + gSprites[sBerryBlender->scoreIconIds[SCORE_BEST]].callback = SpriteCallbackDummy; - sBerryBlenderData->scoreIconIds[BLENDER_SCORE_GOOD] = CreateSprite(&sUnknown_08339B40, 160, 52, 0); - gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_GOOD]].callback = SpriteCallbackDummy; + sBerryBlender->scoreIconIds[SCORE_GOOD] = CreateSprite(&sSpriteTemplate_ScoreSymbols, 160, 52, 0); + // implicitly uses SCOREANIM_GOOD, no need to assign + gSprites[sBerryBlender->scoreIconIds[SCORE_GOOD]].callback = SpriteCallbackDummy; - sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS] = CreateSprite(&sUnknown_08339B40, 192, 52, 0); - StartSpriteAnim(&gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS]], 1); - gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS]].callback = SpriteCallbackDummy; + sBerryBlender->scoreIconIds[SCORE_MISS] = CreateSprite(&sSpriteTemplate_ScoreSymbols, 192, 52, 0); + StartSpriteAnim(&gSprites[sBerryBlender->scoreIconIds[SCORE_MISS]], SCOREANIM_MISS); + gSprites[sBerryBlender->scoreIconIds[SCORE_MISS]].callback = SpriteCallbackDummy; - Blender_SortScores(); + SortScores(); - for (yPos = 0x29, i = 0; i < sBerryBlenderData->playersNo; yPos += 0x10, i++) + for (yPos = 41, i = 0; i < sBerryBlender->numPlayers; yPos += 16, i++) { - u8 place = sBerryBlenderData->playerPlaces[i]; + u8 place = sBerryBlender->playerPlaces[i]; - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1); - StringAppend(sBerryBlenderData->stringVar, sText_Dot); - StringAppend(sBerryBlenderData->stringVar, gText_Space); - StringAppend(sBerryBlenderData->stringVar, gLinkPlayers[place].name); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0, yPos, TEXT_SPEED_FF, 3); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1); + StringAppend(sBerryBlender->stringVar, sText_Dot); + StringAppend(sBerryBlender->stringVar, gText_Space); + StringAppend(sBerryBlender->stringVar, gLinkPlayers[place].name); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 0, yPos, TEXT_SPEED_FF, 3); - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_BEST], STR_CONV_MODE_RIGHT_ALIGN, 3); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x4E, yPos, TEXT_SPEED_FF, 3); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, sBerryBlender->scores[place][SCORE_BEST], STR_CONV_MODE_RIGHT_ALIGN, 3); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 78, yPos, TEXT_SPEED_FF, 3); - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_GOOD], STR_CONV_MODE_RIGHT_ALIGN, 3); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x6E, yPos, TEXT_SPEED_FF, 3); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, sBerryBlender->scores[place][SCORE_GOOD], STR_CONV_MODE_RIGHT_ALIGN, 3); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 78 + 32, yPos, TEXT_SPEED_FF, 3); - ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_MISS], STR_CONV_MODE_RIGHT_ALIGN, 3); - Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x8E, yPos, TEXT_SPEED_FF, 3); + ConvertIntToDecimalStringN(sBerryBlender->stringVar, sBerryBlender->scores[place][SCORE_MISS], STR_CONV_MODE_RIGHT_ALIGN, 3); + Blender_AddTextPrinter(5, sBerryBlender->stringVar, 78 + 64, yPos, TEXT_SPEED_FF, 3); } PutWindowTilemap(5); CopyWindowToVram(5, 3); - sBerryBlenderData->framesToWait = 0; - sBerryBlenderData->mainState++; + sBerryBlender->framesToWait = 0; + sBerryBlender->mainState++; break; case 4: - if (++sBerryBlenderData->framesToWait > 20) - sBerryBlenderData->mainState++; + if (++sBerryBlender->framesToWait > 20) + sBerryBlender->mainState++; break; case 5: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - sBerryBlenderData->mainState++; + sBerryBlender->mainState++; } break; case 6: - sBerryBlenderData->mainState = 0; + sBerryBlender->mainState = 0; return TRUE; } @@ -3539,11 +3760,11 @@ void ShowBerryBlenderRecordWindow(void) DrawStdWindowFrame(gRecordsWindowId, 0); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); - xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); + xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 144); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL); - AddTextPrinterParameterized(gRecordsWindowId, 1, gText_234Players, 4, 0x29, 0, NULL); + AddTextPrinterParameterized(gRecordsWindowId, 1, gText_234Players, 4, 41, 0, NULL); - for (i = 0, yPos = 0x29; i < BLENDER_SCORES_NO; i++) + for (i = 0, yPos = 41; i < NUM_SCORE_TYPES; i++) { u8 *txtPtr; u32 record; @@ -3555,7 +3776,7 @@ void ShowBerryBlenderRecordWindow(void) txtPtr = ConvertIntToDecimalStringN(txtPtr, record % 100, STR_CONV_MODE_LEADING_ZEROS, 2); txtPtr = StringAppend(txtPtr, sText_RPM); - xPos = GetStringRightAlignXOffset(1, text, 0x8C); + xPos = GetStringRightAlignXOffset(1, text, 140); AddTextPrinterParameterized(gRecordsWindowId, 1, text, xPos, yPos + (i * 16), 0, NULL); } @@ -3563,16 +3784,16 @@ void ShowBerryBlenderRecordWindow(void) CopyWindowToVram(gRecordsWindowId, 3); } -static void sub_8083F3C(u8 taskId) +static void Task_PlayPokeblockFanfare(u8 taskId) { if (gTasks[taskId].data[0] == 0) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskId].data[0]++; } if (IsFanfareTaskInactive()) { - PlayBGM(sBerryBlenderData->field_154); + PlayBGM(sBerryBlender->savedMusic); DestroyTask(taskId); } } @@ -3586,28 +3807,30 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen tvBlender->pokeblockColor = pokeblock->color; tvBlender->name[0] = EOS; - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) { - if (sBerryBlenderData->field_1A4 == 0 && sheen > 20) + if (sBerryBlender->ownRanking == 0 && sheen > 20) { - StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].name); + // Player came first, try to put on air + StringCopy(tvBlender->name, gLinkPlayers[sBerryBlender->playerPlaces[sBerryBlender->numPlayers - 1]].name); tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock); if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor, tvBlender->pokeblockColor, tvBlender->pokeblockSheen, - gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].language)) + gLinkPlayers[sBerryBlender->playerPlaces[sBerryBlender->numPlayers - 1]].language)) { return TRUE; } return FALSE; } - else if (sBerryBlenderData->field_1A4 == sBerryBlenderData->playersNo - 1 && sheen <= 20) + else if (sBerryBlender->ownRanking == sBerryBlender->numPlayers - 1 && sheen <= 20) { - StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[0]].name); + // Player came last, try to put on air + StringCopy(tvBlender->name, gLinkPlayers[sBerryBlender->playerPlaces[0]].name); tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock); if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor, tvBlender->pokeblockColor, tvBlender->pokeblockSheen, - gLinkPlayers[sBerryBlenderData->playerPlaces[0]].language)) + gLinkPlayers[sBerryBlender->playerPlaces[0]].language)) { return TRUE; } @@ -3628,19 +3851,19 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3 { case 0: case 3: - txtColor[0] = 1; - txtColor[1] = 2; - txtColor[2] = 3; + txtColor[0] = TEXT_COLOR_WHITE; + txtColor[1] = TEXT_COLOR_DARK_GREY; + txtColor[2] = TEXT_COLOR_LIGHT_GREY; break; case 1: - txtColor[0] = 0; - txtColor[1] = 2; - txtColor[2] = 3; + txtColor[0] = TEXT_COLOR_TRANSPARENT; + txtColor[1] = TEXT_COLOR_DARK_GREY; + txtColor[2] = TEXT_COLOR_LIGHT_GREY; break; case 2: - txtColor[0] = 0; - txtColor[1] = 4; - txtColor[2] = 5; + txtColor[0] = TEXT_COLOR_TRANSPARENT; + txtColor[1] = TEXT_COLOR_RED; + txtColor[2] = TEXT_COLOR_LIGHT_RED; break; } diff --git a/src/berry_crush.c b/src/berry_crush.c index 654a3b4e34..dbbbd20fc6 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -825,7 +825,7 @@ u32 sub_8020C0C(MainCallback callback) if (callback == CB2_ReturnToField) { gTextFlags.autoScroll = TRUE; - PlayNewMapMusic(MUS_POKECEN); + PlayNewMapMusic(MUS_POKE_CENTER); SetMainCallback1(CB1_Overworld); } @@ -900,7 +900,7 @@ static void sub_8020D8C(void) void sub_8020E1C(void) { DestroyTask(gUnknown_02022C90->unkA); - ChooseBerrySetCallback(sub_8020D8C); + ChooseBerryForMachine(sub_8020D8C); } static void sub_8020E3C(void) @@ -1344,9 +1344,9 @@ void sub_80216E0(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1) else { if (sp4 == 1) - PlaySE(SE_TOY_DANGO); + PlaySE(SE_MUD_BALL); else - PlaySE(SE_TOY_KABE); + PlaySE(SE_BREAKABLE_DOOR); arg0->unk25_2 = 1; } @@ -1665,7 +1665,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId) CopyWindowToVram(data[1], 3); break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) break; else return; @@ -2115,7 +2115,7 @@ static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1 case 1: if (IsLinkTaskFinished()) { - PlayNewMapMusic(MUS_RG_SLOT); + PlayNewMapMusic(MUS_RG_GAME_CORNER); sub_8022BEC(7, 1, NULL); r4->unk12 = 3; r4->unkC = 0; @@ -2226,7 +2226,7 @@ static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r case 2: r4->unk138.unk38[r4->unk138.unk0]->callback = sub_8021608; r4->unk138.unk38[r4->unk138.unk0]->affineAnimPaused = FALSE; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); break; case 3: if (r4->unk138.unk38[r4->unk138.unk0]->callback == sub_8021608) @@ -2252,7 +2252,7 @@ static u32 sub_8023070(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r case 6: if (!IsLinkTaskFinished()) return 0; - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); sub_8022BEC(11, 1, NULL); r4->unk12 = 5; r4->unkC = 0; @@ -2274,7 +2274,7 @@ static u32 sub_80231B8(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r r4->unk138.unk1 = 4; r4->unk138.unk0 = 0; r4->unk138.unk2 = gUnknown_082F326C[r4->unk138.unk1][0]; - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); break; case 1: r4->unk2C = gUnknown_082F326C[r4->unk138.unk1][r4->unk138.unk0]; @@ -2357,7 +2357,7 @@ void sub_802339C(struct BerryCrushGame *r4) for (r7 = 0; r7 < r4->unk9; ++r7) { r2 = gRecvCmds[r7]; - if ((r2[0] & 0xFF00) == 0x2F00 + if ((r2[0] & 0xFF00) == RFUCMD_SEND_PACKET && r2[1] == 2) { if ((u8)r2[2] & 4) @@ -2498,9 +2498,9 @@ void sub_8023558(struct BerryCrushGame *r3) void sub_80236B8(struct BerryCrushGame *r5) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) r5->unk5C.unk02_2 = 1; - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) { if (r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5] < r5->unk28) ++r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5]; @@ -2559,7 +2559,7 @@ void sub_80236B8(struct BerryCrushGame *r5) r5->unk5C.unk02_1 = r5->unk25_4; r5->unk5C.unk0A = r5->unk25_5; memcpy(r5->unk40.unk2, &r5->unk5C, sizeof(r5->unk40.unk2)); - sub_800FE50(r5->unk40.unk2); + Rfu_SendPacket(r5->unk40.unk2); } void sub_802385C(struct BerryCrushGame *r5) @@ -2580,7 +2580,7 @@ void sub_802385C(struct BerryCrushGame *r5) for (r4 = 0; r4 < r5->unk9; ++r4) r5->unk68.as_four_players.others[r4].unk4.as_2d_bytes[1][5] = 0; #endif - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00 + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET || gRecvCmds[0][1] != 2) { r5->unk25_2 = 0; @@ -2667,7 +2667,7 @@ static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1 { case 0: r4->unk12 = 8; - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); BlendPalettes(0xFFFFFFFF, 8, RGB(31, 31, 0)); r4->unk138.unk0 = 2; break; @@ -2724,7 +2724,7 @@ static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6) { case 0: r5->unk12 = 9; - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); BlendPalettes(0xFFFFFFFF, 8, RGB(31, 0, 0)); r5->unk138.unk0 = 4; break; @@ -2966,7 +2966,7 @@ static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6) --r5->unk138.unk0; return 0; } - if (!(gMain.newKeys & A_BUTTON)) + if (!(JOY_NEW(A_BUTTON))) return 0; PlaySE(SE_SELECT); sub_802222C(r5); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index dcc21d0368..4c4a010b22 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -190,13 +190,13 @@ static void berry_fix_main(void) berry_fix_mb_manager->state = 1; break; case 1: - if (berry_fix_text_update(5) == 5 && (gMain.newKeys & A_BUTTON)) + if (berry_fix_text_update(5) == 5 && (JOY_NEW(A_BUTTON))) { berry_fix_mb_manager->state = 2; } break; case 2: - if (berry_fix_text_update(0) == 0 && (gMain.newKeys & A_BUTTON)) + if (berry_fix_text_update(0) == 0 && (JOY_NEW(A_BUTTON))) { berry_fix_mb_manager->state = 3; } @@ -235,13 +235,13 @@ static void berry_fix_main(void) } break; case 6: - if (berry_fix_text_update(3) == 3 && gMain.newKeys & A_BUTTON) + if (berry_fix_text_update(3) == 3 && JOY_NEW(A_BUTTON)) { DoSoftReset(); } break; case 7: - if (berry_fix_text_update(4) == 4 && gMain.newKeys & A_BUTTON) + if (berry_fix_text_update(4) == 4 && JOY_NEW(A_BUTTON)) { berry_fix_mb_manager->state = 1; } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index e5c89bdb71..089228b17b 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -536,12 +536,12 @@ static void Task_HandleInput(u8 taskId) { if (!gPaletteFade.active) { - u16 arrowKeys = gMain.newAndRepeatedKeys & DPAD_ANY; + u16 arrowKeys = JOY_REPEAT(DPAD_ANY); if (arrowKeys == DPAD_UP) TryChangeDisplayedBerry(taskId, -1); else if (arrowKeys == DPAD_DOWN) TryChangeDisplayedBerry(taskId, 1); - else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + else if (JOY_NEW(A_BUTTON | B_BUTTON)) PrepareToCloseBerryTagScreen(taskId); } } diff --git a/src/bike.c b/src/bike.c index 5cdf066a9a..c4964b6272 100644 --- a/src/bike.c +++ b/src/bike.c @@ -659,7 +659,7 @@ static void AcroBikeTransition_SideJump(u8 direction) } } playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 5dee9dd4b5..a1ea44e26e 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -93,7 +93,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, METATILE_Cave_SealedChamberEntrance_BottomMid); MapGridSetMetatileIdAt(18, 9, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -140,7 +140,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -186,7 +186,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -286,7 +286,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid); MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -325,7 +325,7 @@ void DoBrailleRegisteelEffect(void) MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid); MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); ScriptContext2_Disable(); } diff --git a/src/cable_car.c b/src/cable_car.c index 94d9d0c665..acd0bc7a5d 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -22,66 +22,74 @@ #include "constants/songs.h" #include "constants/weather.h" +#define GOING_DOWN gSpecialVar_0x8004 + +#define STATE_END 0xFF + +#define TAG_CABLE_CAR 1 +#define TAG_DOOR 2 +#define TAG_CABLE 3 + struct CableCar { - u8 taskId; + u8 bgTaskId; u8 state; u8 weather; - u16 unk4; + u16 weatherDelay; u16 timer; u8 bg0HorizontalOffset; u8 bg0VerticalOffset; - u8 fillerA[0x2]; + u8 unused0[2]; u8 bg1HorizontalOffset; u8 bg1VerticalOffset; - u8 fillerE[0x6]; + u8 unused1[6]; u8 bg3HorizontalOffset; u8 bg3VerticalOffset; - u8 filler16[0x2]; - u8 unk18; - u8 unk19; - u8 unk1A; - u8 unk1B; - u8 unk1C; - u8 unk1D; - u8 unk1E; - u8 unk1F; - u8 unk20; - u16 unk22[9][12]; - u8 fillerFA[0x2]; - /*0x00FC*/ u16 bgTilemapBuffers[4][0x800]; - /*0x40FC*/ u16 *mtChimneyTilemap; - /*0x4100*/ u16 *treeTilemap; - /*0x4104*/ u16 *mountainTilemap; - /*0x4108*/ const u16 *pylonHookTilemapEntries; - /*0x410C*/ u8 *pylonStemTilemap; + u8 unused2[2]; + u8 groundTileIdx; + u8 groundSegmentXStart; + u8 groundSegmentYStart; + u8 groundTilemapOffset; + u8 groundTimer; // Incremented, but does nothing + u8 groundXOffset; + u8 groundYOffset; + u8 groundXBase; + u8 groundYBase; + u16 groundTileBuffer[9][12]; + u8 unused3[2]; + u16 bgTilemapBuffers[4][BG_SCREEN_SIZE]; + u16 *groundTilemap; + u16 *treesTilemap; + u16 *bgMountainsTilemap; + const u16 *pylonHookTilemapEntries; + u8 *pylonStemTilemap; }; static EWRAM_DATA struct CableCar *sCableCar = NULL; -EWRAM_DATA u8 gUnknown_0203ABB0 = 0; -EWRAM_DATA u8 gUnknown_0203ABB1 = 0; -EWRAM_DATA u8 gUnknown_0203ABB2 = 0; -EWRAM_DATA u8 gUnknown_0203ABB3 = 0; -EWRAM_DATA u8 gUnknown_0203ABB4 = 0; -EWRAM_DATA u8 gUnknown_0203ABB5 = 0; +static EWRAM_DATA u8 sGroundX_Up = 0; +static EWRAM_DATA u8 sGroundY_Up = 0; +static EWRAM_DATA u8 sGroundSegmentY_Up = 0; +static EWRAM_DATA u8 sGroundX_Down = 0; +static EWRAM_DATA u8 sGroundY_Down = 0; +static EWRAM_DATA u8 sGroundSegmentY_Down = 0; -static void CableCarMainCallback_Setup(void); -static void sub_8150B6C(u8); -static void LoadCableCarSprites(void); -static void sub_81514C8(u8); -static void sub_81503E4(u8); -static void sub_8150550(u8); -static void sub_8150664(u8); -static void CableCarVblankCallback(void); -static void CableCarMainCallback_Run(void); -static void sub_815115C(void); -static void sub_81511B8(void); -static void sub_8150868(struct Sprite *); -static void nullsub_58(struct Sprite *); -static void sub_8151214(void); -static void sub_8151388(void); +static void CB2_LoadCableCar(void); +static void SetBgRegs(bool8); +static void CreateCableCarSprites(void); +static void InitGroundTilemapData(bool8); +static void Task_CableCar(u8); +static void Task_AnimateBgGoingUp(u8); +static void Task_AnimateBgGoingDown(u8); +static void VBlankCB_CableCar(void); +static void CB2_CableCar(void); +static void AnimateGroundGoingUp(void); +static void AnimateGroundGoingDown(void); +static void SpriteCB_CableCar(struct Sprite *); +static void SpriteCB_Cable(struct Sprite *); +static void DrawNextGroundSegmentGoingUp(void); +static void DrawNextGroundSegmentGoingDown(void); -const struct BgTemplate gCableCarBgTemplates[4] = { +static const struct BgTemplate sBgTemplates[4] = { { .bg = 0, .charBaseIndex = 0, @@ -120,11 +128,11 @@ const struct BgTemplate gCableCarBgTemplates[4] = { }, }; -const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); -const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); -const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); +static const u8 sGround_Tilemap[] = INCBIN_U8("graphics/cable_car/ground.bin.lz"); +static const u8 sTrees_Tilemap[] = INCBIN_U8("graphics/cable_car/trees.bin.lz"); +static const u8 sBgMountains_Tilemap[] = INCBIN_U8("graphics/cable_car/bg_mountains.bin.lz"); -const u16 gCableCarPylonHookTilemapEntries[] = { +static const u16 sPylonHook_TilemapEntries[] = { 0x3000, 0x3001, 0x3002, @@ -137,21 +145,21 @@ const u16 gCableCarPylonHookTilemapEntries[] = { 0x3009, }; -const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); +static const u8 sPylonStems_Tilemap[] = INCBIN_U8("graphics/cable_car/pylons.bin.lz"); -const struct CompressedSpriteSheet gUnknown_085CDB54[] = { - { gCableCar_Gfx, 0x800, 1 }, - { gCableCarDoor_Gfx, 0x40, 2 }, - { gCableCarCord_Gfx, 0x80, 3 }, +static const struct CompressedSpriteSheet sSpriteSheets[] = { + { gCableCar_Gfx, 0x800, TAG_CABLE_CAR }, + { gCableCarDoor_Gfx, 0x40, TAG_DOOR }, + { gCableCarCable_Gfx, 0x80, TAG_CABLE }, { }, }; -const struct SpritePalette gUnknown_085CDB74[] = { - { gCableCar_Pal, 1 }, +static const struct SpritePalette sSpritePalettes[] = { + { gCableCar_Pal, TAG_CABLE_CAR }, { } }; -const struct OamData gOamData_85CDB84 = +static const struct OamData sOam_CableCar = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -165,7 +173,7 @@ const struct OamData gOamData_85CDB84 = .paletteNum = 0, }; -const struct OamData gOamData_85CDB8C = +static const struct OamData sOam_CableCarDoor = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -179,7 +187,7 @@ const struct OamData gOamData_85CDB8C = .paletteNum = 0, }; -const struct OamData gOamData_85CDB94 = +static const struct OamData sOam_Cable = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -193,43 +201,43 @@ const struct OamData gOamData_85CDB94 = .paletteNum = 0, }; -const struct SpriteTemplate gSpriteTemplate_85CDB9C[] = +static const struct SpriteTemplate sSpriteTemplate_CableCar[] = { { - .tileTag = 1, - .paletteTag = 1, - .oam = &gOamData_85CDB84, + .tileTag = TAG_CABLE_CAR, + .paletteTag = TAG_CABLE_CAR, + .oam = &sOam_CableCar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8150868, + .callback = SpriteCB_CableCar, }, { - .tileTag = 2, - .paletteTag = 1, - .oam = &gOamData_85CDB8C, + .tileTag = TAG_DOOR, + .paletteTag = TAG_CABLE_CAR, + .oam = &sOam_CableCarDoor, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8150868, + .callback = SpriteCB_CableCar, }, }; -const struct SpriteTemplate gSpriteTemplate_85CDBCC = { - .tileTag = 3, - .paletteTag = 1, - .oam = &gOamData_85CDB94, +static const struct SpriteTemplate sSpriteTemplate_Cable = { + .tileTag = TAG_CABLE, + .paletteTag = TAG_CABLE_CAR, + .oam = &sOam_Cable, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = nullsub_58, + .callback = SpriteCB_Cable, }; -static void CableCarTask1(u8 taskId) +static void Task_LoadCableCar(u8 taskId) { if (!gPaletteFade.active) { - SetMainCallback2(CableCarMainCallback_Setup); + SetMainCallback2(CB2_LoadCableCar); DestroyTask(taskId); } } @@ -237,11 +245,11 @@ static void CableCarTask1(u8 taskId) void CableCar(void) { ScriptContext2_Enable(); - CreateTask(CableCarTask1, 1); + CreateTask(Task_LoadCableCar, 1); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } -static void CableCarMainCallback_Setup(void) +static void CB2_LoadCableCar(void) { u16 imebak; u8 i = 0; @@ -252,7 +260,7 @@ static void CableCarMainCallback_Setup(void) case 0: default: SetVBlankCallback(NULL); - sub_8150B6C(0); + SetBgRegs(FALSE); ScanlineEffect_Stop(); DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); @@ -267,13 +275,13 @@ static void CableCarMainCallback_Setup(void) ResetPaletteFade(); ResetTempTileDataBuffers(); StartWeather(); - for (i = 0; i < 20; i++) + for (i = 0; i < NUM_ASH_SPRITES; i++) gWeatherPtr->sprites.s2.ashSprites[i] = NULL; InitMapMusic(); ResetMapMusic(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gCableCarBgTemplates, ARRAY_COUNT(gCableCarBgTemplates)); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(0, sCableCar->bgTilemapBuffers[0]); SetBgTilemapBuffer(1, sCableCar->bgTilemapBuffers[1]); SetBgTilemapBuffer(2, sCableCar->bgTilemapBuffers[2]); @@ -282,27 +290,27 @@ static void CableCarMainCallback_Setup(void) gMain.state++; break; case 2: - for (i = 0; i < 3; i++) - LoadCompressedSpriteSheet(&gUnknown_085CDB54[i]); + for (i = 0; i < ARRAY_COUNT(sSpriteSheets) - 1; i++) + LoadCompressedSpriteSheet(&sSpriteSheets[i]); - LoadSpritePalettes(gUnknown_085CDB74); - sCableCar->mtChimneyTilemap = malloc_and_decompress(gCableCarMtChimneyTilemap, &sizeOut); - sCableCar->treeTilemap = malloc_and_decompress(gCableCarTreeTilemap, &sizeOut); - sCableCar->mountainTilemap = malloc_and_decompress(gCableCarMountainTilemap, &sizeOut); - sCableCar->pylonStemTilemap = malloc_and_decompress(gCableCarPylonStemTilemap, &sizeOut); - sCableCar->pylonHookTilemapEntries = gCableCarPylonHookTilemapEntries; - DecompressAndCopyTileDataToVram(0, gUnknown_08DBA5B8, 0, 0, 0); + LoadSpritePalettes(sSpritePalettes); + sCableCar->groundTilemap = malloc_and_decompress(sGround_Tilemap, &sizeOut); + sCableCar->treesTilemap = malloc_and_decompress(sTrees_Tilemap, &sizeOut); + sCableCar->bgMountainsTilemap = malloc_and_decompress(sBgMountains_Tilemap, &sizeOut); + sCableCar->pylonStemTilemap = malloc_and_decompress(sPylonStems_Tilemap, &sizeOut); + sCableCar->pylonHookTilemapEntries = sPylonHook_TilemapEntries; + DecompressAndCopyTileDataToVram(0, gCableCarBg_Gfx, 0, 0, 0); gMain.state++; break; case 3: if (!FreeTempTileDataBuffersIfPossible()) { - LoadPalette(gUnknown_08DBA518, 0, 0x80); + LoadPalette(gCableCarBg_Pal, 0, 0x80); gMain.state++; } break; case 4: - LoadCableCarSprites(); + CreateCableCarSprites(); RunTasks(); gMain.state++; break; @@ -313,7 +321,7 @@ static void CableCarMainCallback_Setup(void) } else if (gWeatherPtr->sprites.s2.ashSprites[0]) { - for (i = 0; i < 20; i++) + for (i = 0; i < NUM_ASH_SPRITES; i++) { if (gWeatherPtr->sprites.s2.ashSprites[i]) gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; @@ -323,28 +331,28 @@ static void CableCarMainCallback_Setup(void) } break; case 6: - CopyToBgTilemapBufferRect_ChangePalette(1, sCableCar->treeTilemap, 0, 17, 32, 15, 17); - CopyToBgTilemapBufferRect_ChangePalette(2, sCableCar->mountainTilemap, 0, 0, 30, 20, 17); + CopyToBgTilemapBufferRect_ChangePalette(1, sCableCar->treesTilemap, 0, 17, 32, 15, 17); + CopyToBgTilemapBufferRect_ChangePalette(2, sCableCar->bgMountainsTilemap, 0, 0, 30, 20, 17); CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonHookTilemapEntries, 0, 0, 5, 2, 17); CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 20, 17); gMain.state++; break; case 7: - sub_81514C8(gSpecialVar_0x8004); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x48, 0, 14, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x6C, 12, 17, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x90, 24, 20, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 0, 17, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 0, 20, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 12, 20, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 12, 23, 12, 3, 17); - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 24, 23, 12, 3, 17); + InitGroundTilemapData(GOING_DOWN); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x48, 0, 14, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x6C, 12, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x90, 24, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x0, 0, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x24, 0, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x0, 12, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x24, 12, 23, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x0, 24, 23, 12, 3, 17); gMain.state++; break; case 8: BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); - FadeInNewBGM(MUS_ROPEWAY, 1); - sub_8150B6C(1); + FadeInNewBGM(MUS_CABLE_CAR, 1); + SetBgRegs(TRUE); gMain.state++; break; case 9: @@ -352,18 +360,18 @@ static void CableCarMainCallback_Setup(void) REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = imebak; - SetVBlankCallback(CableCarVblankCallback); - SetMainCallback2(CableCarMainCallback_Run); - CreateTask(sub_81503E4, 0); - if (gSpecialVar_0x8004 == 0) - sCableCar->taskId = CreateTask(sub_8150550, 1); + SetVBlankCallback(VBlankCB_CableCar); + SetMainCallback2(CB2_CableCar); + CreateTask(Task_CableCar, 0); + if (!GOING_DOWN) + sCableCar->bgTaskId = CreateTask(Task_AnimateBgGoingUp, 1); else - sCableCar->taskId = CreateTask(sub_8150664, 1); + sCableCar->bgTaskId = CreateTask(Task_AnimateBgGoingDown, 1); break; } } -static void CableCarMainCallback_Run(void) +static void CB2_CableCar(void) { RunTasks(); AnimateSprites(); @@ -372,7 +380,7 @@ static void CableCarMainCallback_Run(void) MapMusicMain(); } -static void CleanupCableCar(void) +static void CB2_EndCableCar(void) { u8 i = 0; @@ -380,10 +388,10 @@ static void CleanupCableCar(void) HideBg(1); HideBg(2); HideBg(3); - sub_8150B6C(0); + SetBgRegs(FALSE); gSpriteCoordOffsetX = 0; SetCurrentAndNextWeatherNoDelay(WEATHER_NONE); - for (i = 0; i < 20; i++) + for (i = 0; i < NUM_ASH_SPRITES; i++) gWeatherPtr->sprites.s2.ashSprites[i] = NULL; ResetTasks(); @@ -396,9 +404,9 @@ static void CleanupCableCar(void) ResetBgsAndClearDma3BusyFlags(0); sCableCar->pylonHookTilemapEntries = NULL; FREE_AND_SET_NULL(sCableCar->pylonStemTilemap); - FREE_AND_SET_NULL(sCableCar->mountainTilemap); - FREE_AND_SET_NULL(sCableCar->treeTilemap); - FREE_AND_SET_NULL(sCableCar->mtChimneyTilemap); + FREE_AND_SET_NULL(sCableCar->bgMountainsTilemap); + FREE_AND_SET_NULL(sCableCar->treesTilemap); + FREE_AND_SET_NULL(sCableCar->groundTilemap); FREE_AND_SET_NULL(sCableCar); DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); @@ -408,7 +416,7 @@ static void CleanupCableCar(void) SetMainCallback2(CB2_LoadMap); } -static void sub_81503E4(u8 taskId) +static void Task_CableCar(u8 taskId) { u8 i = 0; @@ -416,13 +424,15 @@ static void sub_81503E4(u8 taskId) switch (sCableCar->state) { case 0: - if (sCableCar->timer == sCableCar->unk4) + // Wait to change weather + if (sCableCar->timer == sCableCar->weatherDelay) { SetNextWeather(sCableCar->weather); sCableCar->state = 1; } break; case 1: + // Update ash sprites switch (sCableCar->weather) { case WEATHER_VOLCANIC_ASH: @@ -442,7 +452,7 @@ static void sub_81503E4(u8 taskId) { sCableCar->state = 2; } - else if (sCableCar->timer >= sCableCar->unk4 + 8) + else if (sCableCar->timer >= sCableCar->weatherDelay + 8) { for (; i < NUM_ASH_SPRITES; i++) { @@ -454,6 +464,7 @@ static void sub_81503E4(u8 taskId) } break; case 2: + // Wait to fade out if (sCableCar->timer == 570) { sCableCar->state = 3; @@ -462,21 +473,22 @@ static void sub_81503E4(u8 taskId) } break; case 3: + // Wait for fade out if (!gPaletteFade.active) - sCableCar->state = 0xFF; + sCableCar->state = STATE_END; break; - case 0xFF: + case STATE_END: SetVBlankCallback(NULL); DestroyTask(taskId); - DestroyTask(sCableCar->taskId); - SetMainCallback2(CleanupCableCar); + DestroyTask(sCableCar->bgTaskId); + SetMainCallback2(CB2_EndCableCar); break; } } -static void sub_8150550(u8 taskId) +static void Task_AnimateBgGoingUp(u8 taskId) { - if (sCableCar->state != 0xFF) + if (sCableCar->state != STATE_END) { sCableCar->bg3HorizontalOffset--; if ((sCableCar->timer % 2) == 0) @@ -507,13 +519,13 @@ static void sub_8150550(u8 taskId) } } - sub_815115C(); + AnimateGroundGoingUp(); gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; } -static void sub_8150664(u8 taskId) +static void Task_AnimateBgGoingDown(u8 taskId) { - if (sCableCar->state != 0xFF) + if (sCableCar->state != STATE_END) { sCableCar->bg3HorizontalOffset++; if ((sCableCar->timer % 2) == 0) @@ -548,14 +560,14 @@ static void sub_8150664(u8 taskId) } } - sub_81511B8(); - if (sCableCar->timer < sCableCar->unk4) + AnimateGroundGoingDown(); + if (sCableCar->timer < sCableCar->weatherDelay) gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; else gWeatherPtr->ashBaseSpritesX = (gWeatherPtr->ashBaseSpritesX + 247) % 248; } -static void CableCarVblankCallback(void) +static void VBlankCB_CableCar(void) { CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(3); @@ -570,83 +582,100 @@ static void CableCarVblankCallback(void) TransferPlttBuffer(); } -static void nullsub_58(struct Sprite *sprite) +static void SpriteCB_Cable(struct Sprite *sprite) { + } -static void sub_8150868(struct Sprite *sprite) +#define sXPos data[0] +#define sYPos data[1] + +static void SpriteCB_CableCar(struct Sprite *sprite) { - if (sCableCar->state != 0xFF) + if (sCableCar->state != STATE_END) { - if (gSpecialVar_0x8004 == 0) + if (!GOING_DOWN) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); } } } -void sub_8150948(struct Sprite *sprite) +#define sState data[2] +#define sTimer data[3] + +static void SpriteCB_Player(struct Sprite *sprite) { - if (sCableCar->state != 255) + if (sCableCar->state != STATE_END) { - if (!gSpecialVar_0x8004) + // Move along with cable car + if (!GOING_DOWN) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); } - switch (sprite->data[2]) + // Bounce up and down + switch (sprite->sState) { case 0: sprite->pos2.y = 17; - if (sprite->data[3] ++ > 9) + if (sprite->sTimer++ > 9) { - sprite->data[3] = 0; - sprite->data[2] ++; + sprite->sTimer = 0; + sprite->sState++; } break; default: sprite->pos2.y = 16; - if (sprite->data[3] ++ > 9) + if (sprite->sTimer++ > 9) { - sprite->data[3] = 0; - sprite->data[2] = 0; + sprite->sTimer = 0; + sprite->sState = 0; } break; } } } -static void sub_8150A68(struct Sprite *sprite) +#undef sState +#undef sTimer + +#define sTimer data[0] +#define sSameDir data[1] // Whether or not the hiker is headed the same dir as the Cable Car +#define sDelay data[2] + +static void SpriteCB_HikerGoingUp(struct Sprite *sprite) { - if (sprite->data[0] == 0) + if (sprite->sTimer == 0) { sprite->pos1.x += 2 * sprite->centerToCornerVecX; sprite->pos1.y += 16 + sprite->centerToCornerVecY; } - if (++sprite->data[0] >= sprite->data[2]) + if (++sprite->sTimer >= sprite->sDelay) { - switch (sprite->data[1]) + switch (sprite->sSameDir) { - case 0: + case FALSE: sprite->pos1.x++; - if ((sprite->data[0] % 4) == 0) + if ((sprite->sTimer % 4) == 0) sprite->pos1.y++; break; - case 1: - if ((sprite->data[0] % 2) != 0) + case TRUE: + // Hiker moves slower if travelling with the Cable Car + if ((sprite->sTimer % 2) != 0) { sprite->pos1.x++; if ((sprite->pos1.x % 4) == 0) @@ -660,22 +689,23 @@ static void sub_8150A68(struct Sprite *sprite) } } -static void sub_8150AF4(struct Sprite *sprite) +static void SpriteCB_HikerGoingDown(struct Sprite *sprite) { - if (sprite->data[0] == 0) + if (sprite->sTimer == 0) sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (++sprite->data[0] >= sprite->data[2]) + if (++sprite->sTimer >= sprite->sDelay) { - switch (sprite->data[1]) + switch (sprite->sSameDir) { - case 0: + case FALSE: sprite->pos1.x--; - if ((sprite->data[0] % 4) == 0) + if ((sprite->sTimer % 4) == 0) sprite->pos1.y--; break; - case 1: - if ((sprite->data[0] % 2) != 0) + case TRUE: + // Hiker moves slower if travelling with the Cable Car + if ((sprite->sTimer % 2) != 0) { sprite->pos1.x--; if ((sprite->pos1.x % 4) == 0) @@ -689,9 +719,11 @@ static void sub_8150AF4(struct Sprite *sprite) } } -static void sub_8150B6C(bool8 which) +#undef sTimer + +static void SetBgRegs(bool8 active) { - switch (which) + switch (active) { case FALSE: default: @@ -723,7 +755,7 @@ static void sub_8150B6C(bool8 which) SetGpuReg(REG_OFFSET_WIN1H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); SetGpuReg(REG_OFFSET_WIN1V, 0); - if (gSpecialVar_0x8004 == 0) + if (!GOING_DOWN) { sCableCar->bg3HorizontalOffset = 176; sCableCar->bg3VerticalOffset = 16; @@ -762,14 +794,14 @@ static void sub_8150B6C(bool8 which) } } -static void LoadCableCarSprites(void) +static void CreateCableCarSprites(void) { u8 spriteId; u8 i; u8 playerGraphicsIds[2] = { - OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, - OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + [MALE] = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, + [FEMALE] = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL }; u16 rval = Random(); u8 hikerGraphicsIds[4] = { @@ -779,248 +811,264 @@ static void LoadCableCarSprites(void) OBJ_EVENT_GFX_ZIGZAGOON_1 }; s16 hikerCoords[2][2] = { - { 0, 80 }, - { 240, 146 } + { 0, 80 }, // Going up + { 240, 146 } // Going down }; - u8 hikerMovementDelayTable[4] = { - 0, - 60, - 120, - 170 - }; - void (*callbacks[2])(struct Sprite *) = { - sub_8150A68, - sub_8150AF4 + u8 hikerMovementDelayTable[4] = { 0, 60, 120, 170}; + void (*hikerCallbacks[2])(struct Sprite *) = { + SpriteCB_HikerGoingUp, + SpriteCB_HikerGoingDown }; - switch (gSpecialVar_0x8004) + switch (GOING_DOWN) { - case 0: + case FALSE: default: - spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + // Create player sprite + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], SpriteCB_Player, 200, 73, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; gSprites[spriteId].pos2.x = 8; gSprites[spriteId].pos2.y = 16; - gSprites[spriteId].data[0] = 0xc8; - gSprites[spriteId].data[1] = 0x49; + gSprites[spriteId].sXPos = 200; + gSprites[spriteId].sYPos = 73; } - spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 176, 43, 0x67); + // Create car sprite + spriteId = CreateSprite(&sSpriteTemplate_CableCar[0], 176, 43, 0x67); gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32; - gSprites[spriteId].data[0] = 176; - gSprites[spriteId].data[1] = 43; - spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 200, 99, 0x65); + gSprites[spriteId].sXPos = 176; + gSprites[spriteId].sYPos = 43; + // Create door sprite + spriteId = CreateSprite(&sSpriteTemplate_CableCar[1], 200, 99, 0x65); gSprites[spriteId].pos2.x = 8; gSprites[spriteId].pos2.y = 4; - gSprites[spriteId].data[0] = 200; - gSprites[spriteId].data[1] = 99; + gSprites[spriteId].sXPos = 200; + gSprites[spriteId].sYPos = 99; + // Init weather sCableCar->weather = WEATHER_VOLCANIC_ASH; - sCableCar->unk4 = 0x15e; + sCableCar->weatherDelay = 350; SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY); break; - case 1: - CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); - spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + case TRUE: + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->groundTilemap + 0x24, 24, 26, 12, 3, 17); + // Create player sprite + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], SpriteCB_Player, 128, 39, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; gSprites[spriteId].pos2.x = 8; gSprites[spriteId].pos2.y = 16; - gSprites[spriteId].data[0] = 0x80; - gSprites[spriteId].data[1] = 0x27; + gSprites[spriteId].sXPos = 128; + gSprites[spriteId].sYPos = 39; } - spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 104, 9, 0x67); - gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; - gSprites[spriteId].data[0] = 104; - gSprites[spriteId].data[1] = 9; - spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 128, 65, 0x65); + // Create car sprite + spriteId = CreateSprite(&sSpriteTemplate_CableCar[0], 104, 9, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].sXPos = 104; + gSprites[spriteId].sYPos = 9; + // Create door sprite + spriteId = CreateSprite(&sSpriteTemplate_CableCar[1], 128, 65, 0x65); gSprites[spriteId].pos2.x = 8; gSprites[spriteId].pos2.y = 4; - gSprites[spriteId].data[0] = 0x80; - gSprites[spriteId].data[1] = 0x41; + gSprites[spriteId].sXPos = 128; + gSprites[spriteId].sYPos = 65; + // Init weather sCableCar->weather = WEATHER_SUNNY; - sCableCar->unk4 = 0x109; + sCableCar->weatherDelay = 265; SetCurrentAndNextWeatherNoDelay(WEATHER_VOLCANIC_ASH); break; } for (i = 0; i < 9; i++) { - spriteId = CreateSprite(&gSpriteTemplate_85CDBCC, 16 * i + 96, 8 * i - 8, 0x68); + spriteId = CreateSprite(&sSpriteTemplate_Cable, 16 * i + 96, 8 * i - 8, 0x68); gSprites[spriteId].pos2.x = 8; gSprites[spriteId].pos2.y = 8; } + + // 1/64 chance for an NPC to appear hiking on the ground below the Cable Car if ((rval % 64) == 0) { - spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + // Unclear if this was intentional, but the - 1 in the below ARRAY_COUNT means the Zigzagoon is never used + spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % (ARRAY_COUNT(hikerGraphicsIds) - 1)], hikerCallbacks[GOING_DOWN], hikerCoords[GOING_DOWN][0], hikerCoords[GOING_DOWN][1], 106); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX; gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY; - if (gSpecialVar_0x8004 == 0) + + // Randomly choose which direction the NPC is going + if (!GOING_DOWN) { if (rval % 2) { + // Do walking west anim StartSpriteAnim(&gSprites[spriteId], 6); - gSprites[spriteId].data[1] = 1; + gSprites[spriteId].sSameDir = TRUE; gSprites[spriteId].pos1.y += 2; } else { + // Do walking east anim StartSpriteAnim(&gSprites[spriteId], 7); - gSprites[spriteId].data[1] = 0; + gSprites[spriteId].sSameDir = FALSE; } } else { if (rval % 2) { + // Do walking east anim StartSpriteAnim(&gSprites[spriteId], 7); - gSprites[spriteId].data[1] = 1; + gSprites[spriteId].sSameDir = TRUE; gSprites[spriteId].pos1.y += 2; } else { + // Do walking west anim StartSpriteAnim(&gSprites[spriteId], 6); - gSprites[spriteId].data[1] = 0; + gSprites[spriteId].sSameDir = FALSE; } } - gSprites[spriteId].data[2] = hikerMovementDelayTable[rval % 4]; + gSprites[spriteId].sDelay = hikerMovementDelayTable[rval % ARRAY_COUNT(hikerMovementDelayTable)]; } } } -void sub_8151088(void) +static void BufferNextGroundSegment(void) { - u8 i; - u8 j; - u8 k; + u8 i, j, k; u8 offset; - for (i = 0, k = 0, offset = 0x24 * (sCableCar->unk1B + 2); i < 3; i++) + for (i = 0, k = 0, offset = 0x24 * (sCableCar->groundTilemapOffset + 2); i < 3; i++) { - for (j = 0; j < 12; j++) + for (j = 0; j < ARRAY_COUNT(sCableCar->groundTileBuffer[0]); j++) { - sCableCar->unk22[i][j] = sCableCar->mtChimneyTilemap[offset++]; - sCableCar->unk22[i + 3][j] = sCableCar->mtChimneyTilemap[k]; - sCableCar->unk22[i + 6][j] = (sCableCar->mtChimneyTilemap + 0x24)[k]; + sCableCar->groundTileBuffer[i][j] = sCableCar->groundTilemap[offset++]; + sCableCar->groundTileBuffer[i + 3][j] = sCableCar->groundTilemap[k]; + sCableCar->groundTileBuffer[i + 6][j] = (sCableCar->groundTilemap + 0x24)[k]; k++; } } - sCableCar->unk1B = (sCableCar->unk1B + 1) % 3; + sCableCar->groundTilemapOffset = (sCableCar->groundTilemapOffset + 1) % 3; } -static void sub_815115C(void) +static void AnimateGroundGoingUp(void) { - sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; - sCableCar->bg0HorizontalOffset = sCableCar->unk1F - sCableCar->unk1D; - sCableCar->bg0VerticalOffset = sCableCar->unk20 - sCableCar->unk1E; - sCableCar->unk1D++; - if ((sCableCar->unk1D % 4) == 0) - sCableCar->unk1E++; + sCableCar->groundTimer = (sCableCar->groundTimer + 1) % 96; + sCableCar->bg0HorizontalOffset = sCableCar->groundXBase - sCableCar->groundXOffset; + sCableCar->bg0VerticalOffset = sCableCar->groundYBase - sCableCar->groundYOffset; + sCableCar->groundXOffset++; + if ((sCableCar->groundXOffset % 4) == 0) + sCableCar->groundYOffset++; - if (sCableCar->unk1D > 16) - sub_8151214(); + if (sCableCar->groundXOffset > 16) + DrawNextGroundSegmentGoingUp(); } -static void sub_81511B8(void) +static void AnimateGroundGoingDown(void) { - sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; - sCableCar->bg0HorizontalOffset = sCableCar->unk1F + sCableCar->unk1D; - sCableCar->bg0VerticalOffset = sCableCar->unk20 + sCableCar->unk1E; - sCableCar->unk1D++; - if ((sCableCar->unk1D % 4) == 0) - sCableCar->unk1E++; + sCableCar->groundTimer = (sCableCar->groundTimer + 1) % 96; + sCableCar->bg0HorizontalOffset = sCableCar->groundXBase + sCableCar->groundXOffset; + sCableCar->bg0VerticalOffset = sCableCar->groundYBase + sCableCar->groundYOffset; + sCableCar->groundXOffset++; + if ((sCableCar->groundXOffset % 4) == 0) + sCableCar->groundYOffset++; - if (sCableCar->unk1D > 16) - sub_8151388(); + if (sCableCar->groundXOffset > 16) + DrawNextGroundSegmentGoingDown(); } -static void sub_8151214(void) +static void DrawNextGroundSegmentGoingUp(void) { u8 i = 0; - sCableCar->unk1D = sCableCar->unk1E = 0; - sCableCar->unk1F = sCableCar->bg0HorizontalOffset; - sCableCar->unk20 = sCableCar->bg0VerticalOffset; - sCableCar->unk19 = (sCableCar->unk19 + 30) % 32; - sCableCar->unk18 -= 2; - gUnknown_0203ABB2 = (sCableCar->unk1A + 23) % 32; - for (i = 0; i < 9; i++) + sCableCar->groundXOffset = sCableCar->groundYOffset = 0; + sCableCar->groundXBase = sCableCar->bg0HorizontalOffset; + sCableCar->groundYBase = sCableCar->bg0VerticalOffset; + sCableCar->groundSegmentXStart = (sCableCar->groundSegmentXStart + 30) % 32; + sCableCar->groundTileIdx -= 2; + sGroundSegmentY_Up = (sCableCar->groundSegmentYStart + 23) % 32; + + // Draw next segment + for (i = 0; i < ARRAY_COUNT(sCableCar->groundTileBuffer); i++) { - gUnknown_0203ABB0 = sCableCar->unk19; - gUnknown_0203ABB1 = (gUnknown_0203ABB2 + i) % 32; - FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); - gUnknown_0203ABB0 = (gUnknown_0203ABB0 + 1) % 32; - FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); + sGroundX_Up = sCableCar->groundSegmentXStart; + sGroundY_Up = (sGroundSegmentY_Up + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->groundTileBuffer[i][sCableCar->groundTileIdx], sGroundX_Up, sGroundY_Up, 1, 1, 17); + sGroundX_Up = (sGroundX_Up + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->groundTileBuffer[i][sCableCar->groundTileIdx + 1], sGroundX_Up, sGroundY_Up, 1, 1, 17); } - gUnknown_0203ABB0 = (sCableCar->unk19 + 30) % 32; - FillBgTilemapBufferRect(0, 0, gUnknown_0203ABB0, 0, 2, 32, 17); - if (sCableCar->unk18 == 0) + // Erase old segment + sGroundX_Up = (sCableCar->groundSegmentXStart + 30) % 32; + FillBgTilemapBufferRect(0, 0, sGroundX_Up, 0, 2, 32, 17); + if (sCableCar->groundTileIdx == 0) { - sCableCar->unk1A = (sCableCar->unk1A + 29) % 32; - sCableCar->unk18 = 12; - sub_8151088(); - gUnknown_0203ABB0 = (sCableCar->unk1A + 1) % 32; - FillBgTilemapBufferRect(0, 0, 0, gUnknown_0203ABB0, 32, 9, 17); + sCableCar->groundSegmentYStart = (sCableCar->groundSegmentYStart + 29) % 32; + sCableCar->groundTileIdx = 12; + BufferNextGroundSegment(); + sGroundX_Up = (sCableCar->groundSegmentYStart + 1) % 32; + FillBgTilemapBufferRect(0, 0, 0, sGroundX_Up, 32, 9, 17); } } -static void sub_8151388(void) +static void DrawNextGroundSegmentGoingDown(void) { u8 i = 0; - sCableCar->unk1D = sCableCar->unk1E = 0; - sCableCar->unk1F = sCableCar->bg0HorizontalOffset; - sCableCar->unk20 = sCableCar->bg0VerticalOffset; - sCableCar->unk19 = (sCableCar->unk19 + 2) % 32; - sCableCar->unk18 += 2; - gUnknown_0203ABB5 = sCableCar->unk1A; - for (i = 0; i < 9; i++) + sCableCar->groundXOffset = sCableCar->groundYOffset = 0; + sCableCar->groundXBase = sCableCar->bg0HorizontalOffset; + sCableCar->groundYBase = sCableCar->bg0VerticalOffset; + sCableCar->groundSegmentXStart = (sCableCar->groundSegmentXStart + 2) % 32; + sCableCar->groundTileIdx += 2; + sGroundSegmentY_Down = sCableCar->groundSegmentYStart; + + // Draw next segment + for (i = 0; i < ARRAY_COUNT(sCableCar->groundTileBuffer); i++) { - gUnknown_0203ABB3 = sCableCar->unk19; - gUnknown_0203ABB4 = (gUnknown_0203ABB5 + i) % 32; - FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); - gUnknown_0203ABB3 = (gUnknown_0203ABB3 + 1) % 32; - FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); + sGroundX_Down = sCableCar->groundSegmentXStart; + sGroundY_Down = (sGroundSegmentY_Down + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->groundTileBuffer[i][sCableCar->groundTileIdx], sGroundX_Down, sGroundY_Down, 1, 1, 17); + sGroundX_Down = (sGroundX_Down + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->groundTileBuffer[i][sCableCar->groundTileIdx + 1], sGroundX_Down, sGroundY_Down, 1, 1, 17); } - gUnknown_0203ABB4 = (sCableCar->unk1A + 23) % 32; - FillBgTilemapBufferRect(0, 0, sCableCar->unk19, gUnknown_0203ABB4, 2, 9, 17); - if (sCableCar->unk18 == 10) + // Erase old segment + sGroundY_Down = (sCableCar->groundSegmentYStart + 23) % 32; + FillBgTilemapBufferRect(0, 0, sCableCar->groundSegmentXStart, sGroundY_Down, 2, 9, 17); + if (sCableCar->groundTileIdx == 10) { - sCableCar->unk1A = (sCableCar->unk1A + 3) % 32; - sCableCar->unk18 = 0xfe; - sub_8151088(); + sCableCar->groundSegmentYStart = (sCableCar->groundSegmentYStart + 3) % 32; + sCableCar->groundTileIdx = -2; + BufferNextGroundSegment(); } } -static void sub_81514C8(u8 arg0) +static void InitGroundTilemapData(bool8 goingDown) { - switch (arg0) + switch (goingDown) { - case 0: + case FALSE: default: - sCableCar->unk1B = 2; - sCableCar->unk19 = 0; - sCableCar->unk1A = 20; - sCableCar->unk18 = 12; - sub_8151088(); - sub_8151214(); + sCableCar->groundTilemapOffset = 2; + sCableCar->groundSegmentXStart = 0; + sCableCar->groundSegmentYStart = 20; + sCableCar->groundTileIdx = 12; + BufferNextGroundSegment(); + DrawNextGroundSegmentGoingUp(); break; - case 1: - sCableCar->unk1B = 2; - sCableCar->unk19 = 28; - sCableCar->unk1A = 20; - sCableCar->unk18 = 4; - sub_8151088(); - sub_8151388(); + case TRUE: + sCableCar->groundTilemapOffset = 2; + sCableCar->groundSegmentXStart = 28; + sCableCar->groundSegmentYStart = 20; + sCableCar->groundTileIdx = 4; + BufferNextGroundSegment(); + DrawNextGroundSegmentGoingDown(); break; } - sCableCar->unk1C = 0; + sCableCar->groundTimer = 0; } diff --git a/src/cable_club.c b/src/cable_club.c index 982bd9fd3c..f02683c9d1 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -163,7 +163,7 @@ static bool32 CheckLinkErrored(u8 taskId) static bool32 CheckLinkCanceledBeforeConnection(u8 taskId) { - if ((gMain.newKeys & B_BUTTON) + if ((JOY_NEW(B_BUTTON)) && IsLinkConnectionEstablished() == FALSE) { gLinkType = 0; @@ -178,7 +178,7 @@ static bool32 CheckLinkCanceled(u8 taskId) if (IsLinkConnectionEstablished()) SetSuppressLinkErrorMessage(TRUE); - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { gLinkType = 0; gTasks[taskId].func = Task_LinkupFailed; @@ -277,7 +277,7 @@ static void Task_LinkupAwaitConfirmation(u8 taskId) UpdateLinkPlayerCountDisplay(taskId, linkPlayerCount); - if (!(gMain.newKeys & A_BUTTON)) + if (!(JOY_NEW(A_BUTTON))) return; if (linkPlayerCount < tMinPlayers) @@ -304,12 +304,12 @@ static void Task_LinkupTryConfirmation(u8 taskId) ShowFieldAutoScrollMessage(gText_ConfirmLinkWhenPlayersReady); gTasks[taskId].func = Task_LinkupConfirmWhenReady; } - else if (gMain.heldKeys & B_BUTTON) + else if (JOY_HELD(B_BUTTON)) { ShowFieldAutoScrollMessage(gText_ConfirmLinkWhenPlayersReady); gTasks[taskId].func = Task_LinkupConfirmWhenReady; } - else if (gMain.heldKeys & A_BUTTON) + else if (JOY_HELD(A_BUTTON)) { PlaySE(SE_SELECT); CheckShouldAdvanceLinkState(); @@ -865,9 +865,9 @@ static void Task_StartWiredCableClubBattle(u8 taskId) break; case 5: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_VS_TRAINER); SetLinkBattleTypeFlags(gSpecialVar_0x8004); CleanupOverworldWindowsAndTilemaps(); @@ -930,9 +930,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) break; case 7: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_VS_TRAINER); gLinkPlayers[0].linkType = LINKTYPE_BATTLE; SetLinkBattleTypeFlags(gSpecialVar_0x8004); diff --git a/src/confetti_util.c b/src/confetti_util.c index 3bda3ab539..6d47700567 100644 --- a/src/confetti_util.c +++ b/src/confetti_util.c @@ -30,10 +30,8 @@ static void sub_81520A8(void *dest, u16 value, u8 left, u8 top, u8 width, u8 hei static void sub_8152134(void *dest, const u16 *src, u8 left, u8 top, u8 width, u8 height) // Unused. { - u8 i; - u8 j; - u8 x; - u8 y; + u8 i, j; + u8 x, y; const u16 *_src; for (i = 0, _src = src, y = top; i < height; i++) diff --git a/src/contest.c b/src/contest.c index 4470ec2a2c..612d79562d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1389,7 +1389,7 @@ static void Task_RaiseCurtainAtStart(u8 taskId) if (gTasks[taskId].data[1]++ <= 60) break; gTasks[taskId].data[1] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].data[0]++; break; case 1: @@ -1493,7 +1493,7 @@ static void Task_DisplayAppealNumberText(u8 taskId) static void Task_TryShowMoveSelectScreen(u8 taskId) { // Wait for button press to show move select screen - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys == B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (gMain.newKeys == B_BUTTON)) { PlaySE(SE_SELECT); if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) @@ -1559,7 +1559,7 @@ static void Task_HandleMoveSelectInput(u8 taskId) numMoves++; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); gTasks[taskId].func = Task_SelectedMove; @@ -1961,7 +1961,7 @@ static void Task_DoAppeals(u8 taskId) return; case APPEALSTATE_UPDATE_MOVE_USERS_STATUS: if (DrawStatusSymbol(contestant)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); gTasks[taskId].tState = APPEALSTATE_UPDATE_OPPONENTS; return; case APPEALSTATE_UPDATE_OPPONENTS: @@ -2052,9 +2052,9 @@ static void Task_DoAppeals(u8 taskId) break; } if (DrawStatusSymbol(i)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); else - PlaySE(SE_C_SYU); + PlaySE(SE_CONTEST_ICON_CLEAR); if (eContestantStatus[i].judgesAttentionWasRemoved) { StopFlashJudgeAttentionEye(i); @@ -2243,7 +2243,7 @@ static void Task_DoAppeals(u8 taskId) { case 0: BlendAudienceBackground(-1, 1); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); gTasks[taskId].tCounter++; break; case 1: @@ -2288,7 +2288,7 @@ static void Task_DoAppeals(u8 taskId) if (!eContest.waitForAudienceBlend) { AnimateAudience(); - PlaySE(SE_W227B); + PlaySE(SE_M_ENCORE2); ShowAndUpdateApplauseMeter(1); gTasks[taskId].tCounter++; } @@ -2683,7 +2683,7 @@ static void Task_WaitForOutOfTimeMsg(u8 taskId) SetBgForCurtainDrop(); gBattle_BG1_X = 0; gBattle_BG1_Y = 160; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = Task_DropCurtainAtAppealsEnd; } @@ -3277,7 +3277,7 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod) ContestBG_FillBoxWithTile(0, GetStarTileOffset(), 19, contestantOffset, 1, numStars, 17); if (resetMod) { - PlaySE(SE_EXPMAX); + PlaySE(SE_EXP_MAX); eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE; } } @@ -3286,7 +3286,7 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod) ContestBG_FillBoxWithTile(0, 0, 19, contestantOffset + numStars, 1, 3 - numStars, 17); if (resetMod) { - PlaySE(SE_FU_ZAKU2); + PlaySE(SE_CONTEST_CONDITION_LOSE); eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE; } } @@ -3814,7 +3814,7 @@ static void Task_UpdateAppealHearts(u8 taskId) ContestBG_FillBoxWithTile(0, heartOffset, newNumHearts + 22, gContestantTurnOrder[contestant] * 5 + 2 + onSecondLine, 1, 1, 17); if (heartsDelta > 0) { - PlaySE(SE_C_GAJI); + PlaySE(SE_CONTEST_HEART); m4aMPlayImmInit(&gMPlayInfo_SE1); m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, pitchMod * 256); } @@ -4137,12 +4137,12 @@ static u8 CreateContestantBoxBlinkSprites(u8 contestant) CpuFill32(0, gContestResources->boxBlinkTiles2 + 0x500, 0x300); RequestDma3Copy(gContestResources->boxBlinkTiles1, - (u8 *)(VRAM + 0x10000 + gSprites[spriteId1].oam.tileNum * 32), + (u8 *)(OBJ_VRAM0 + gSprites[spriteId1].oam.tileNum * 32), 0x800, 1); RequestDma3Copy(gContestResources->boxBlinkTiles2, - (u8 *)(VRAM + 0x10000 + gSprites[spriteId2].oam.tileNum * 32), + (u8 *)(OBJ_VRAM0 + gSprites[spriteId2].oam.tileNum * 32), 0x800, 1); @@ -4189,7 +4189,7 @@ static void BlinkContestantBox(u8 spriteId, bool8 b) gSprites[spriteId].callback = SpriteCB_BlinkContestantBox; gSprites[spriteId2].callback = SpriteCallbackDummy; if (b == FALSE) - PlaySE(SE_C_PIKON); + PlaySE(SE_CONTEST_MONS_TURN); else PlaySE(SE_PC_LOGIN); } @@ -4678,36 +4678,36 @@ static void DoJudgeSpeechBubble(u8 symbolId) case JUDGE_SYMBOL_SWIRL: case JUDGE_SYMBOL_SWIRL_UNUSED: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0]; - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; case JUDGE_SYMBOL_ONE_EXCLAMATION: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case JUDGE_SYMBOL_TWO_EXCLAMATIONS: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case JUDGE_SYMBOL_NUMBER_ONE_UNUSED: // Identical to JUDGE_SYMBOL_NUMBER_ONE gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case JUDGE_SYMBOL_NUMBER_ONE: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case JUDGE_SYMBOL_NUMBER_FOUR: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case JUDGE_SYMBOL_STAR: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24; - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); break; case JUDGE_SYMBOL_QUESTION_MARK: default: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; } gSprites[spriteId].data[1] = 0; @@ -4728,8 +4728,8 @@ static void UpdateApplauseMeter(void) src = &gContestApplauseMeterGfx[64]; else src = gContestApplauseMeterGfx; - CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[eContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); - CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[eContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); + CpuCopy32(src, (void *)(OBJ_VRAM0 + (gSprites[eContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); + CpuCopy32(src + 32, (void *)(OBJ_VRAM0 + (gSprites[eContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); if (eContest.applauseLevel > 4) StartApplauseOverflowAnimation(); @@ -5042,7 +5042,7 @@ static void DrawUnnervedSymbols(void) ContestBG_FillBoxWithIncrementingTile(0, symbolOffset, 20, contestantOffset, 2, 1, 17, 1); symbolOffset += 16; ContestBG_FillBoxWithIncrementingTile(0, symbolOffset, 20, contestantOffset + 1, 2, 1, 17, 1); - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); } } } @@ -5123,7 +5123,7 @@ static void Task_StartDropCurtainAtRoundEnd(u8 taskId) { gBattle_BG1_X = 0; gBattle_BG1_Y = DISPLAY_HEIGHT; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].func = Task_UpdateCurtainDropAtRoundEnd; } @@ -5235,7 +5235,7 @@ static void Task_StartRaiseCurtainAtRoundEnd(u8 taskId) else { gTasks[taskId].data[2] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].func = Task_UpdateRaiseCurtainAtRoundEnd; } } @@ -5411,7 +5411,7 @@ static void Contest_PrintTextToBg0WindowStd(u32 windowId, const u8 *b) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = 15; printerTemplate.bgColor = 0; printerTemplate.shadowColor = 8; @@ -5434,7 +5434,7 @@ void Contest_PrintTextToBg0WindowAt(u32 windowId, u8 *currChar, s32 x, s32 y, s3 printerTemplate.currentY = y; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = 15; printerTemplate.bgColor = 0; printerTemplate.shadowColor = 8; @@ -5458,7 +5458,7 @@ static void Contest_StartTextPrinter(const u8 *currChar, bool32 b) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = 1; printerTemplate.bgColor = 0; printerTemplate.shadowColor = 8; diff --git a/src/contest_painting.c b/src/contest_painting.c index a0c39dfc7e..292b11bf47 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -248,7 +248,7 @@ static void HoldContestPainting(void) gContestPaintingFadeCounter--; break; case 1: - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) { gContestPaintingState++; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); diff --git a/src/contest_util.c b/src/contest_util.c index 00254248f8..ae76eda6b4 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -192,18 +192,18 @@ static const struct OamData sOamData_858D7F0 = .affineParam = 0, }; -static const struct SpriteTemplate sSpriteTemplate_858D7F8 = +static const struct SpriteTemplate sSpriteTemplate_858D7F8 = { - .tileTag = 3009, - .paletteTag = 3009, - .oam = &sOamData_858D7F0, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, + .tileTag = 3009, + .paletteTag = 3009, + .oam = &sOamData_858D7F0, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteSheet sUnknown_0858D810[] = +static const struct SpriteSheet sUnknown_0858D810[] = { { .data = gMiscBlank_Gfx, .size = 0x400, .tag = 3009 }, { .data = gMiscBlank_Gfx, .size = 0x400, .tag = 3010 }, @@ -240,26 +240,26 @@ static const struct OamData sOamData_Confetti = static const struct SpriteTemplate sSpriteTemplate_Confetti = { - .tileTag = TAG_CONFETTI, - .paletteTag = TAG_CONFETTI, - .oam = &sOamData_Confetti, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, + .tileTag = TAG_CONFETTI, + .paletteTag = TAG_CONFETTI, + .oam = &sOamData_Confetti, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_Confetti }; static const struct CompressedSpriteSheet sSpriteSheet_Confetti = { - .data = gConfetti_Gfx, - .size = 0x220, + .data = gConfetti_Gfx, + .size = 0x220, .tag = TAG_CONFETTI }; static const struct CompressedSpritePalette sSpritePalette_Confetti = { - .data = gConfetti_Pal, + .data = gConfetti_Pal, .tag = TAG_CONFETTI }; @@ -282,7 +282,7 @@ static const struct BgTemplate sBgTemplates[] = .paletteMode = 0, .priority = 3, .baseTile = 0, - }, + }, { .bg = 2, .charBaseIndex = 0, @@ -291,7 +291,7 @@ static const struct BgTemplate sBgTemplates[] = .paletteMode = 0, .priority = 3, .baseTile = 0, - }, + }, { .bg = 3, .charBaseIndex = 0, @@ -306,39 +306,39 @@ static const struct BgTemplate sBgTemplates[] = static const struct WindowTemplate sWindowTemplates[] = { { - .bg = 1, - .tilemapLeft = 7, - .tilemapTop = 4, - .width = 12, - .height = 2, - .paletteNum = 15, + .bg = 1, + .tilemapLeft = 7, + .tilemapTop = 4, + .width = 12, + .height = 2, + .paletteNum = 15, .baseBlock = 770 }, { - .bg = 1, - .tilemapLeft = 7, - .tilemapTop = 7, - .width = 12, - .height = 2, - .paletteNum = 15, + .bg = 1, + .tilemapLeft = 7, + .tilemapTop = 7, + .width = 12, + .height = 2, + .paletteNum = 15, .baseBlock = 794 }, { - .bg = 1, - .tilemapLeft = 7, - .tilemapTop = 10, - .width = 12, - .height = 2, - .paletteNum = 15, + .bg = 1, + .tilemapLeft = 7, + .tilemapTop = 10, + .width = 12, + .height = 2, + .paletteNum = 15, .baseBlock = 818 }, { - .bg = 1, - .tilemapLeft = 7, - .tilemapTop = 13, - .width = 12, - .height = 2, - .paletteNum = 15, + .bg = 1, + .tilemapLeft = 7, + .tilemapTop = 13, + .width = 12, + .height = 2, + .paletteNum = 15, .baseBlock = 842 }, DUMMY_WIN_TEMPLATE, @@ -364,19 +364,19 @@ static const struct OamData sUnknown_0858D8C0 = static const struct SpriteTemplate sSpriteTemplate_858D8C8 = { - .tileTag = 22222, - .paletteTag = 0, - .oam = &sUnknown_0858D8C0, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, + .tileTag = 22222, + .paletteTag = 0, + .oam = &sUnknown_0858D8C0, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteSheet sUnknown_0858D8E0 = +static const struct SpriteSheet sUnknown_0858D8E0 = { - .data = gMiscBlank_Gfx, - .size = 0x200, + .data = gMiscBlank_Gfx, + .size = 0x200, .tag = 22222 }; @@ -533,7 +533,7 @@ static void CB2_StartShowContestResults(void) if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS) gPaletteFade.bufferTransferDisabled = TRUE; else - PlayBGM(MUS_CON_K); + PlayBGM(MUS_CONTEST_RESULTS); SetVBlankCallback(VBlankCB_ShowContestResults); } @@ -619,7 +619,7 @@ static void Task_ShowContestResults(u8 taskId) case 3: if (IsLinkTaskFinished() == TRUE) { - PlayBGM(MUS_CON_K); + PlayBGM(MUS_CONTEST_RESULTS); gPaletteFade.bufferTransferDisabled = FALSE; gTasks[taskId].tState++; break; @@ -1148,350 +1148,71 @@ static void TryCreateWirelessSprites(void) } } -// Functionally equivalent, the same except compiler generated variables from -// src are placed on different stack positions. - -#ifdef NONMATCHING static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId) { - u8 *windowTilesPtr; u16 windowId; - int origWidth; - struct WindowTemplate windowTemplate; - int strWidth; + s32 origWidth, strWidth; u8 *spriteTilePtrs[4]; u8 *dst; - int i; - struct Sprite *sprite; - const u8 *src; // The culprit. - memset(&windowTemplate, 0, sizeof(windowTemplate)); - windowTemplate.width = 30; - windowTemplate.height = 2; - windowId = AddWindow(&windowTemplate); - FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - - origWidth = GetStringWidth(1, text, 0); - strWidth = (origWidth + 9) / 8; - if (strWidth > 30) - strWidth = 30; - - AddTextPrinterParameterized3(windowId, 1, (strWidth * 8 - origWidth) / 2, 1, sContestLinkTextColors, -1, text); - windowTilesPtr = (u8 *)(GetWindowAttribute(windowId, WINDOW_TILE_DATA)); - src = (u8 *)(sUnknown_0858D6D0); - - sprite = &gSprites[spriteId]; - spriteTilePtrs[0] = (u8 *)(sprite->oam.tileNum * 32 + VRAM + 0x10000); - - for (i = 1; i < 4; i++) - spriteTilePtrs[i] = (void*)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + VRAM + 0x10000); - - for (i = 0; i < 4; i++) - CpuFill32(0, spriteTilePtrs[i], 0x400); - - dst = spriteTilePtrs[0]; - CpuCopy32(src, dst, 0x20); - CpuCopy32(src + 128, dst + 0x100, 0x20); - CpuCopy32(src + 128, dst + 0x200, 0x20); - CpuCopy32(src + 64, dst + 0x300, 0x20); - - for (i = 0; i < strWidth; i++) { - dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32]; - CpuCopy32(src + 192, dst, 0x20); - CpuCopy32(windowTilesPtr, dst + 0x100, 0x20); - CpuCopy32(windowTilesPtr + 960, dst + 0x200, 0x20); - CpuCopy32(src + 224, dst + 0x300, 0x20); - windowTilesPtr += 0x20; + struct WindowTemplate windowTemplate; //It's important the lifetime of this struct ends after the clear + memset(&windowTemplate, 0, sizeof(windowTemplate)); + windowTemplate.width = 30; + windowTemplate.height = 2; + windowId = AddWindow(&windowTemplate); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); } - dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32]; - CpuCopy32(src + 32, dst, 0x20); - CpuCopy32(src + 160, dst + 0x100, 0x20); - CpuCopy32(src + 160, dst + 0x200, 0x20); - CpuCopy32(src + 96, dst + 0x300, 0x20); + origWidth = GetStringWidth(1, text, 0); + if ((strWidth = (origWidth + 9) / 8) > 30) + strWidth = 30; + + AddTextPrinterParameterized3(windowId, 1, (strWidth * 8 - origWidth) / 2, 1, sContestLinkTextColors, -1, text); + + { + s32 i; + struct Sprite *sprite; + const u8 *src, *windowTilesPtr; + windowTilesPtr = (const u8 *)(GetWindowAttribute(windowId, WINDOW_TILE_DATA)); + src = sUnknown_0858D6D0; + + sprite = &gSprites[spriteId]; + spriteTilePtrs[0] = (u8 *)((OBJ_VRAM0) + sprite->oam.tileNum * 32); + + for (i = 1; i < 4; i++) + spriteTilePtrs[i] = (u8 *)((OBJ_VRAM0) + gSprites[sprite->data[i - 1]].oam.tileNum * 32); + + for (i = 0; i < 4; i++) + CpuFill32(0, spriteTilePtrs[i], 0x400); + + dst = spriteTilePtrs[0]; + CpuCopy32(src, dst, 0x20); + CpuCopy32(src + 128, dst + 0x100, 0x20); + CpuCopy32(src + 128, dst + 0x200, 0x20); + CpuCopy32(src + 64, dst + 0x300, 0x20); + + for (i = 0; i < strWidth; i++) + { + dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32]; + CpuCopy32(src + 192, dst, 0x20); + CpuCopy32(windowTilesPtr, dst + 0x100, 0x20); + CpuCopy32(windowTilesPtr + 960, dst + 0x200, 0x20); + CpuCopy32(src + 224, dst + 0x300, 0x20); + windowTilesPtr += 0x20; + } + + dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32]; + CpuCopy32(src + 32, dst, 0x20); + CpuCopy32(src + 160, dst + 0x100, 0x20); + CpuCopy32(src + 160, dst + 0x200, 0x20); + CpuCopy32(src + 96, dst + 0x300, 0x20); + } RemoveWindow(windowId); return (240 - (strWidth + 2) * 8) / 2; } -#else -NAKED -static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x44\n\ - adds r5, r0, 0\n\ - lsls r1, 24\n\ - lsrs r7, r1, 24\n\ - add r4, sp, 0x20\n\ - adds r0, r4, 0\n\ - movs r1, 0\n\ - movs r2, 0x8\n\ - bl memset\n\ - movs r0, 0x1E\n\ - strb r0, [r4, 0x3]\n\ - movs r0, 0x2\n\ - strb r0, [r4, 0x4]\n\ - adds r0, r4, 0\n\ - bl AddWindow\n\ - lsls r6, r0, 24\n\ - lsrs r4, r6, 24\n\ - adds r0, r4, 0\n\ - movs r1, 0x11\n\ - bl FillWindowPixelBuffer\n\ - movs r0, 0x1\n\ - adds r1, r5, 0\n\ - movs r2, 0\n\ - bl GetStringWidth\n\ - adds r2, r0, 0\n\ - adds r2, 0x9\n\ - cmp r2, 0\n\ - bge _080F6BC4\n\ - adds r2, 0x7\n\ -_080F6BC4:\n\ - asrs r2, 3\n\ - mov r10, r2\n\ - cmp r2, 0x1E\n\ - ble _080F6BD0\n\ - movs r1, 0x1E\n\ - mov r10, r1\n\ -_080F6BD0:\n\ - mov r1, r10\n\ - lsls r2, r1, 3\n\ - subs r2, r0\n\ - lsrs r0, r2, 31\n\ - adds r2, r0\n\ - asrs r2, 1\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - ldr r0, =sContestLinkTextColors\n\ - str r0, [sp]\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - str r0, [sp, 0x4]\n\ - str r5, [sp, 0x8]\n\ - adds r0, r4, 0\n\ - movs r1, 0x1\n\ - movs r3, 0x1\n\ - bl AddTextPrinterParameterized3\n\ - adds r0, r4, 0\n\ - movs r1, 0x7\n\ - bl GetWindowAttribute\n\ - mov r9, r0\n\ - ldr r2, =sUnknown_0858D6D0\n\ - mov r8, r2\n\ - lsls r1, r7, 4\n\ - adds r1, r7\n\ - lsls r1, 2\n\ - ldr r3, =gSprites\n\ - adds r1, r3\n\ - ldrh r0, [r1, 0x4]\n\ - lsls r0, 22\n\ - lsrs r0, 17\n\ - ldr r2, =0x06010000\n\ - adds r0, r2\n\ - str r0, [sp, 0xC]\n\ - str r6, [sp, 0x38]\n\ - mov r7, sp\n\ - adds r7, 0x1C\n\ - str r7, [sp, 0x2C]\n\ - mov r0, r10\n\ - adds r0, 0x2\n\ - str r0, [sp, 0x30]\n\ - movs r5, 0\n\ - add r7, sp, 0x10\n\ - mov r12, r7\n\ - adds r6, r1, 0\n\ - adds r6, 0x2E\n\ - movs r4, 0x2\n\ -_080F6C34:\n\ - adds r0, r6, r5\n\ - movs r7, 0\n\ - ldrsh r1, [r0, r7]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r3\n\ - ldrh r0, [r0, 0x4]\n\ - lsls r0, 22\n\ - lsrs r0, 17\n\ - adds r0, r2\n\ - mov r1, r12\n\ - adds r1, 0x4\n\ - mov r12, r1\n\ - subs r1, 0x4\n\ - stm r1!, {r0}\n\ - adds r5, 0x2\n\ - subs r4, 0x1\n\ - cmp r4, 0\n\ - bge _080F6C34\n\ - mov r7, r8\n\ - adds r7, 0x80\n\ - mov r2, r8\n\ - adds r2, 0x40\n\ - str r2, [sp, 0x28]\n\ - mov r0, r8\n\ - adds r0, 0x20\n\ - str r0, [sp, 0x3C]\n\ - mov r1, r8\n\ - adds r1, 0xA0\n\ - str r1, [sp, 0x40]\n\ - adds r2, 0x20\n\ - str r2, [sp, 0x34]\n\ - add r5, sp, 0xC\n\ - movs r6, 0\n\ - movs r4, 0x3\n\ -_080F6C7C:\n\ - str r6, [sp, 0x1C]\n\ - ldm r5!, {r1}\n\ - ldr r0, [sp, 0x2C]\n\ - ldr r2, =0x05000100\n\ - bl CpuSet\n\ - subs r4, 0x1\n\ - cmp r4, 0\n\ - bge _080F6C7C\n\ - ldr r5, [sp, 0xC]\n\ - ldr r6, =0x04000008\n\ - mov r0, r8\n\ - adds r1, r5, 0\n\ - adds r2, r6, 0\n\ - bl CpuSet\n\ - movs r0, 0x80\n\ - lsls r0, 1\n\ - adds r1, r5, r0\n\ - adds r0, r7, 0\n\ - adds r2, r6, 0\n\ - bl CpuSet\n\ - movs r2, 0x80\n\ - lsls r2, 2\n\ - adds r1, r5, r2\n\ - adds r0, r7, 0\n\ - adds r2, r6, 0\n\ - bl CpuSet\n\ - movs r7, 0xC0\n\ - lsls r7, 2\n\ - adds r1, r5, r7\n\ - ldr r0, [sp, 0x28]\n\ - adds r2, r6, 0\n\ - bl CpuSet\n\ - movs r4, 0\n\ - cmp r4, r10\n\ - bge _080F6D32\n\ - adds r7, r6, 0\n\ -_080F6CCE:\n\ - adds r6, r4, 0x1\n\ - adds r0, r6, 0\n\ - cmp r6, 0\n\ - bge _080F6CDA\n\ - adds r0, r4, 0\n\ - adds r0, 0x8\n\ -_080F6CDA:\n\ - asrs r0, 3\n\ - lsls r1, r0, 2\n\ - add r1, sp\n\ - adds r1, 0xC\n\ - lsls r0, 3\n\ - subs r0, r6, r0\n\ - lsls r0, 5\n\ - ldr r1, [r1]\n\ - adds r5, r1, r0\n\ - mov r0, r8\n\ - adds r0, 0xC0\n\ - adds r1, r5, 0\n\ - adds r2, r7, 0\n\ - bl CpuSet\n\ - movs r0, 0x80\n\ - lsls r0, 1\n\ - adds r1, r5, r0\n\ - mov r0, r9\n\ - adds r2, r7, 0\n\ - bl CpuSet\n\ - movs r0, 0xF0\n\ - lsls r0, 2\n\ - add r0, r9\n\ - movs r2, 0x80\n\ - lsls r2, 2\n\ - adds r1, r5, r2\n\ - adds r2, r7, 0\n\ - bl CpuSet\n\ - movs r0, 0xC0\n\ - lsls r0, 2\n\ - adds r1, r5, r0\n\ - mov r0, r8\n\ - adds r0, 0xE0\n\ - adds r2, r7, 0\n\ - bl CpuSet\n\ - movs r1, 0x20\n\ - add r9, r1\n\ - adds r4, r6, 0\n\ - cmp r4, r10\n\ - blt _080F6CCE\n\ -_080F6D32:\n\ - adds r2, r4, 0x1\n\ - adds r0, r2, 0\n\ - cmp r2, 0\n\ - bge _080F6D3E\n\ - adds r0, r4, 0\n\ - adds r0, 0x8\n\ -_080F6D3E:\n\ - asrs r0, 3\n\ - lsls r1, r0, 2\n\ - add r1, sp\n\ - adds r1, 0xC\n\ - lsls r0, 3\n\ - subs r0, r2, r0\n\ - lsls r0, 5\n\ - ldr r1, [r1]\n\ - adds r5, r1, r0\n\ - ldr r4, =0x04000008\n\ - ldr r0, [sp, 0x3C]\n\ - adds r1, r5, 0\n\ - adds r2, r4, 0\n\ - bl CpuSet\n\ - movs r2, 0x80\n\ - lsls r2, 1\n\ - adds r1, r5, r2\n\ - ldr r0, [sp, 0x40]\n\ - adds r2, r4, 0\n\ - bl CpuSet\n\ - movs r7, 0x80\n\ - lsls r7, 2\n\ - adds r1, r5, r7\n\ - ldr r0, [sp, 0x40]\n\ - adds r2, r4, 0\n\ - bl CpuSet\n\ - movs r0, 0xC0\n\ - lsls r0, 2\n\ - adds r1, r5, r0\n\ - ldr r0, [sp, 0x34]\n\ - adds r2, r4, 0\n\ - bl CpuSet\n\ - ldr r1, [sp, 0x38]\n\ - lsrs r0, r1, 24\n\ - bl RemoveWindow\n\ - ldr r2, [sp, 0x30]\n\ - lsls r1, r2, 3\n\ - movs r0, 0xF0\n\ - subs r0, r1\n\ - asrs r0, 1\n\ - add sp, 0x44\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING - static void LoadContestResultSprites(void) { int i; @@ -1796,7 +1517,7 @@ static void Task_DrawFinalStandingNumber(u8 taskId) WriteSequenceToBgTilemapBuffer(2, firstTileNum + 0x10, 1, gTasks[taskId].tMonIndex * 3 + 6, 2, 1, 17, 1); sContestResults->data->numStandingsPrinted++; DestroyTask(taskId); - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); } } } @@ -2201,7 +1922,7 @@ static void AddContestTextPrinter(int windowId, u8 *str, int x) textPrinter.currentY = 2; textPrinter.letterSpacing = 0; textPrinter.lineSpacing = 0; - textPrinter.unk = 0; + textPrinter.style = 0; textPrinter.fgColor = 1; textPrinter.bgColor = 0; textPrinter.shadowColor = 8; @@ -2787,8 +2508,8 @@ bool8 GiveMonArtistRibbon(void) u8 hasArtistRibbon; hasArtistRibbon = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON); - if (!hasArtistRibbon - && gContestFinalStandings[gContestPlayerMonIndex] == 0 + if (!hasArtistRibbon + && gContestFinalStandings[gContestPlayerMonIndex] == 0 && gSpecialVar_ContestRank == CONTEST_RANK_MASTER && gContestMonTotalPoints[gContestPlayerMonIndex] >= 800) { @@ -2905,8 +2626,8 @@ static void Task_ShowContestEntryMonPic(u8 taskId) void GetContestMultiplayerId(void) { - if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) - && gNumLinkContestPlayers == CONTESTANT_COUNT + if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) + && gNumLinkContestPlayers == CONTESTANT_COUNT && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)) gSpecialVar_Result = GetMultiplayerId(); else diff --git a/src/credits.c b/src/credits.c index 270a069063..71ca0286fb 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1144,7 +1144,7 @@ static void CB2_RunCreditsSequence(void) RunTasks(); AnimateSprites(); - if ((gMain.heldKeys & B_BUTTON) + if ((JOY_HELD(B_BUTTON)) && gHasHallOfFameRecords != 0 && gTasks[gUnknown_0203BCE2].func == Task_ProgressCreditTasks) { @@ -1161,7 +1161,7 @@ static void sub_8175548(void) { ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sBackgroundTemplates, 1); - SetBgTilemapBuffer(0, AllocZeroed(0x800)); + SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); LoadPalette(gUnknown_085E56F0, 0x80, 0x40); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); @@ -1240,7 +1240,7 @@ void CB2_StartCreditsSequence(void) BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(CreditsVBlankCallback); - m4aSongNumStart(MUS_THANKFOR); + m4aSongNumStart(MUS_CREDITS); SetMainCallback2(CB2_RunCreditsSequence); gUnknown_0203BCE5 = 0; sCreditsData = AllocZeroed(sizeof(struct CreditsData)); diff --git a/src/data/graphics/rayquaza_scene.h b/src/data/graphics/rayquaza_scene.h index d0269980c5..633213db87 100644 --- a/src/data/graphics/rayquaza_scene.h +++ b/src/data/graphics/rayquaza_scene.h @@ -1,73 +1,62 @@ -const u32 gRaySceneGroudon_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon.4bpp.lz"); -const u32 gRaySceneGroudon2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_shoulder.4bpp.lz"); -const u32 gRaySceneGroudon3_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_claw.4bpp.lz"); +// Scene 1 (RAY_ANIM_DUO_FIGHT / RAY_ANIM_DUO_FIGHT_PRE) +const u32 gRaySceneDuoFight_Groudon_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon.4bpp.lz"); +const u32 gRaySceneDuoFight_GroudonShoulder_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon_shoulder.4bpp.lz"); +const u32 gRaySceneDuoFight_GroudonClaw_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon_claw.4bpp.lz"); +const u32 gRaySceneDuoFight_Kyogre_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre.4bpp.lz"); +const u32 gRaySceneDuoFight_KyogrePectoralFin_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre_pectoral_fin.4bpp.lz"); +const u32 gRaySceneDuoFight_KyogreDorsalFin_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre_dorsal_fin.4bpp.lz"); +const u32 gRaySceneDuoFight_Groudon_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon.gbapal.lz"); +const u32 gRaySceneDuoFight_Kyogre_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre.gbapal.lz"); +const u32 gRaySceneDuoFight_Clouds_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds.4bpp.lz"); +const u32 gRaySceneDuoFight_Clouds_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds.gbapal.lz"); // pal 1 clouds, pal 2 rain +const u32 gRaySceneDuoFight_Clouds1_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds1.bin.lz"); +const u32 gRaySceneDuoFight_Clouds2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds2.bin.lz"); +const u32 gRaySceneDuoFight_Clouds3_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds3.bin.lz"); -const u32 gRaySceneKyogre_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre.4bpp.lz"); -const u32 gRaySceneKyogre2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_shoulder.4bpp.lz"); -const u32 gRaySceneKyogre3_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_fin.4bpp.lz"); +// Scene 2 (RAY_ANIM_TAKES_FLIGHT) +const u32 gRaySceneTakesFlight_Smoke_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/smoke.4bpp.lz"); +const u32 gRaySceneTakesFlight_Smoke_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/smoke.gbapal.lz"); +const u32 gRaySceneTakesFlight_Rayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.8bpp.lz"); +const u32 gRaySceneTakesFlight_Rayquaza_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.gbapal.lz"); +const u32 gRaySceneTakesFlight_Rayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.bin.lz"); +const u32 gRaySceneTakesFlight_Bg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/bg.4bpp.lz"); // uses pal 2 of gRaySceneTakesFlight_Rayquaza_Pal +const u32 gRaySceneTakesFlight_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/bg.bin.lz"); -const u32 gRaySceneGroudon_Pal[] = INCBIN_U32("graphics/rayquaza_scene/groudon.gbapal.lz"); -const u32 gRaySceneKyogre_Pal[] = INCBIN_U32("graphics/rayquaza_scene/kyogre.gbapal.lz"); +// Scene 3 (RAY_ANIM_DESCENDS) +const u32 gRaySceneDescends_Rayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza.4bpp.lz"); +// for some reason there are an extra 0xC bytes at the end of the original rayquaza_tail.4bpp, so in order to produce the correct lz, +// we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. +const u32 gRaySceneDescends_RayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza_tail_fix.4bpp.lz"); +const u32 gRaySceneDescends_Bg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.4bpp.lz"); +const u32 gRaySceneDescends_Light_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.4bpp.lz"); // uses pal 2 of gRaySceneDescends_Bg_Pal +const u32 gRaySceneDescends_Bg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.gbapal.lz"); +const u32 gRaySceneDescends_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.bin.lz"); +const u32 gRaySceneDescends_Light_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.bin.lz"); -const u32 gRaySceneClouds_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/clouds.4bpp.lz"); -const u32 gRaySceneClouds_Pal[] = INCBIN_U32("graphics/rayquaza_scene/clouds.gbapal.lz"); // pal 1 clouds, pal 2 rain -const u32 gRaySceneClouds1_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds1.bin.lz"); -const u32 gRaySceneClouds2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds2.bin.lz"); -const u32 gRaySceneClouds3_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds3.bin.lz"); +// Scene 4 (RAY_ANIM_CHARGES) +const u32 gRaySceneCharges_Bg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.4bpp.lz"); +const u32 gRaySceneCharges_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.bin.lz"); +const u32 gRaySceneCharges_Streaks_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/streaks.4bpp.lz"); +const u32 gRaySceneCharges_Streaks_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/streaks.bin.lz"); +const u32 gRaySceneCharges_Rayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza.4bpp.lz"); +const u32 gRaySceneCharges_Rayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza.bin.lz"); +const u32 gRaySceneCharges_Orbs_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/orbs.bin.lz"); +const u32 gRaySceneCharges_Bg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.gbapal.lz"); -const u32 gRaySceneSmoke_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/smoke.4bpp.lz"); -const u32 gRaySceneSmoke_Pal[] = INCBIN_U32("graphics/rayquaza_scene/smoke.gbapal.lz"); - -const u32 gRaySceneRayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.8bpp.lz"); -const u32 gRaySceneRayquaza_Pal[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.gbapal.lz"); -const u32 gRaySceneRayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.bin.lz"); - -const u32 gRaySceneOvercast_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/overcast.4bpp.lz"); // uses pal 2 of gRaySceneRayquaza_Pal -const u32 gRaySceneOvercast_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/overcast.bin.lz"); - -const u32 gRaySceneRayquazaFly1_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_fly1.4bpp.lz"); -const u32 gRaySceneRayquazaTail_Gfx[] = INCBIN_U32( "graphics/rayquaza_scene/rayquaza_tail_fix.4bpp.lz"); // for some reason there are an extra 0xC bytes at the end of the original 4bpp, so in order to produce the correct lz, we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. - -const u32 gRaySceneOvercast2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.4bpp.lz"); - -const u32 gRaySceneRayquazaLight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_light.4bpp.lz"); // uses pal 2 of gRaySceneOvercast2_Pal - -const u32 gRaySceneOvercast2_Pal[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.gbapal.lz"); -const u32 gRaySceneOvercast2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.bin.lz"); - -const u32 gRaySceneRayquazaLight_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_light.bin.lz"); - -const u32 gRaySceneChaseBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/chase_bg.4bpp.lz"); -const u32 gRaySceneChaseBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/chase_bg.bin.lz"); - -const u32 gRaySceneChaseStreaks_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/chase_streaks.4bpp.lz"); -const u32 gRaySceneChaseStreaks_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/chase_streaks.bin.lz"); - -const u32 gRaySceneRayquazaChase_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase.4bpp.lz"); -const u32 gRayChaseRayquazaChase_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase.bin.lz"); -const u32 gRayChaseRayquazaChase2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase2.bin.lz"); - -const u32 gRaySceneChase_Pal[] = INCBIN_U32("graphics/rayquaza_scene/chase.gbapal.lz"); - -const u32 gRaySceneGroudonLeft_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_left.4bpp.lz"); -const u32 gRaySceneGroudonTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_tail.4bpp.lz"); - -const u32 gRaySceneKyogreRight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_right.4bpp.lz"); - -const u32 gRaySceneRayquazaHover_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_hover.4bpp.lz"); -const u32 gRaySceneRayquazaFlyIn_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_flyin.4bpp.lz"); - -const u32 gRaySceneSplash_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/splash.4bpp.lz"); - -const u32 gRaySceneGroudonLeft_Pal[] = INCBIN_U32("graphics/rayquaza_scene/groudon_left.gbapal.lz"); -const u32 gRaySceneKyogreRight_Pal[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_right.gbapal.lz"); -const u32 gRaySceneRayquazaHover_Pal[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_hover.gbapal.lz"); - -const u32 gRaySceneSplash_Pal[] = INCBIN_U32("graphics/rayquaza_scene/splash.gbapal.lz"); - -const u32 gRaySceneHushBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.4bpp.lz"); -const u32 gRaySceneHushRing_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring.8bpp.lz"); -const u32 gRaySceneHushBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.bin.lz"); -const u32 gRaySceneHushRing_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring.bin.lz"); -const u32 gRaySceneHushRing_Map[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring_map.bin.lz"); -const u32 gRaySceneHushBg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.gbapal.lz"); +// Scene 5 (RAY_ANIM_CHASES_AWAY) +const u32 gRaySceneChasesAway_Groudon_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon.4bpp.lz"); +const u32 gRaySceneChasesAway_GroudonTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon_tail.4bpp.lz"); +const u32 gRaySceneChasesAway_Kyogre_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre.4bpp.lz"); +const u32 gRaySceneChasesAway_Rayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza.4bpp.lz"); +const u32 gRaySceneChasesAway_RayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza_tail.4bpp.lz"); +const u32 gRaySceneChasesAway_KyogreSplash_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre_splash.4bpp.lz"); +const u32 gRaySceneChasesAway_Groudon_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon.gbapal.lz"); +const u32 gRaySceneChasesAway_Kyogre_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre.gbapal.lz"); +const u32 gRaySceneChasesAway_Rayquaza_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza.gbapal.lz"); +const u32 gRaySceneChasesAway_KyogreSplash_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre_splash.gbapal.lz"); +const u32 gRaySceneChasesAway_Light_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/light.4bpp.lz"); +const u32 gRaySceneChasesAway_Ring_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring.8bpp.lz"); +const u32 gRaySceneChasesAway_Light_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/light.bin.lz"); +const u32 gRaySceneChasesAway_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.bin.lz"); +const u32 gRaySceneChasesAway_Ring_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring.bin.lz"); +const u32 gRaySceneChasesAway_Bg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.gbapal.lz"); diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h index 1d503d72ff..6b433f90fa 100644 --- a/src/data/region_map/region_map_entries.h +++ b/src/data/region_map/region_map_entries.h @@ -200,219 +200,219 @@ static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS"); static const u8 sMapName_TrainerHill[] = _("TRAINER HILL"); const struct RegionMapLocation gRegionMapEntries[] = { - [MAPSEC_LITTLEROOT_TOWN] = { 4, 11, 1, 1, sMapName_LittlerootTown}, - [MAPSEC_OLDALE_TOWN] = { 4, 9, 1, 1, sMapName_OldaleTown}, - [MAPSEC_DEWFORD_TOWN] = { 2, 14, 1, 1, sMapName_DewfordTown}, - [MAPSEC_LAVARIDGE_TOWN] = { 5, 3, 1, 1, sMapName_LavaridgeTown}, - [MAPSEC_FALLARBOR_TOWN] = { 3, 0, 1, 1, sMapName_FallarborTown}, - [MAPSEC_VERDANTURF_TOWN] = { 4, 6, 1, 1, sMapName_VerdanturfTown}, - [MAPSEC_PACIFIDLOG_TOWN] = {17, 10, 1, 1, sMapName_PacifidlogTown}, - [MAPSEC_PETALBURG_CITY] = { 1, 9, 1, 1, sMapName_PetalburgCity}, - [MAPSEC_SLATEPORT_CITY] = { 8, 10, 1, 2, sMapName_SlateportCity}, - [MAPSEC_MAUVILLE_CITY] = { 8, 6, 2, 1, sMapName_MauvilleCity}, - [MAPSEC_RUSTBORO_CITY] = { 0, 5, 1, 2, sMapName_RustboroCity}, - [MAPSEC_FORTREE_CITY] = {12, 0, 1, 1, sMapName_FortreeCity}, - [MAPSEC_LILYCOVE_CITY] = {18, 3, 2, 1, sMapName_LilycoveCity}, - [MAPSEC_MOSSDEEP_CITY] = {24, 5, 2, 1, sMapName_MossdeepCity}, - [MAPSEC_SOOTOPOLIS_CITY] = {21, 7, 1, 1, sMapName_SootopolisCity}, - [MAPSEC_EVER_GRANDE_CITY] = {27, 8, 1, 2, sMapName_EverGrandeCity}, - [MAPSEC_ROUTE_101] = { 4, 10, 1, 1, sMapName_Route101}, - [MAPSEC_ROUTE_102] = { 2, 9, 2, 1, sMapName_Route102}, - [MAPSEC_ROUTE_103] = { 4, 8, 4, 1, sMapName_Route103}, - [MAPSEC_ROUTE_104] = { 0, 7, 1, 3, sMapName_Route104}, - [MAPSEC_ROUTE_105] = { 0, 10, 1, 3, sMapName_Route105}, - [MAPSEC_ROUTE_106] = { 0, 13, 2, 1, sMapName_Route106}, - [MAPSEC_ROUTE_107] = { 3, 14, 3, 1, sMapName_Route107}, - [MAPSEC_ROUTE_108] = { 6, 14, 2, 1, sMapName_Route108}, - [MAPSEC_ROUTE_109] = { 8, 12, 1, 3, sMapName_Route109}, - [MAPSEC_ROUTE_110] = { 8, 7, 1, 3, sMapName_Route110}, - [MAPSEC_ROUTE_111] = { 8, 0, 1, 6, sMapName_Route111}, - [MAPSEC_ROUTE_112] = { 6, 3, 2, 1, sMapName_Route112}, - [MAPSEC_ROUTE_113] = { 4, 0, 4, 1, sMapName_Route113}, - [MAPSEC_ROUTE_114] = { 1, 0, 2, 3, sMapName_Route114}, - [MAPSEC_ROUTE_115] = { 0, 2, 1, 3, sMapName_Route115}, - [MAPSEC_ROUTE_116] = { 1, 5, 4, 1, sMapName_Route116}, - [MAPSEC_ROUTE_117] = { 5, 6, 3, 1, sMapName_Route117}, - [MAPSEC_ROUTE_118] = {10, 6, 2, 1, sMapName_Route118}, - [MAPSEC_ROUTE_119] = {11, 0, 1, 6, sMapName_Route119}, - [MAPSEC_ROUTE_120] = {13, 0, 1, 4, sMapName_Route120}, - [MAPSEC_ROUTE_121] = {14, 3, 4, 1, sMapName_Route121}, - [MAPSEC_ROUTE_122] = {16, 4, 1, 2, sMapName_Route122}, - [MAPSEC_ROUTE_123] = {12, 6, 5, 1, sMapName_Route123}, - [MAPSEC_ROUTE_124] = {20, 3, 4, 3, sMapName_Route124}, - [MAPSEC_ROUTE_125] = {24, 3, 2, 2, sMapName_Route125}, - [MAPSEC_ROUTE_126] = {20, 6, 3, 3, sMapName_Route126}, - [MAPSEC_ROUTE_127] = {23, 6, 3, 3, sMapName_Route127}, - [MAPSEC_ROUTE_128] = {23, 9, 4, 1, sMapName_Route128}, - [MAPSEC_ROUTE_129] = {24, 10, 2, 1, sMapName_Route129}, - [MAPSEC_ROUTE_130] = {21, 10, 3, 1, sMapName_Route130}, - [MAPSEC_ROUTE_131] = {18, 10, 3, 1, sMapName_Route131}, - [MAPSEC_ROUTE_132] = {15, 10, 2, 1, sMapName_Route132}, - [MAPSEC_ROUTE_133] = {12, 10, 3, 1, sMapName_Route133}, - [MAPSEC_ROUTE_134] = { 9, 10, 3, 1, sMapName_Route134}, - [MAPSEC_UNDERWATER_124] = {20, 3, 4, 3, sMapName_Underwater}, - [MAPSEC_UNDERWATER_125] = {20, 6, 3, 3, sMapName_Underwater}, - [MAPSEC_UNDERWATER_126] = {23, 6, 3, 3, sMapName_Underwater}, - [MAPSEC_UNDERWATER_127] = {23, 9, 4, 1, sMapName_Underwater}, - [MAPSEC_UNDERWATER_SOOTOPOLIS] = {21, 7, 1, 1, sMapName_Underwater}, - [MAPSEC_GRANITE_CAVE] = { 1, 13, 1, 1, sMapName_GraniteCave}, - [MAPSEC_MT_CHIMNEY] = { 6, 2, 1, 1, sMapName_MtChimney}, - [MAPSEC_SAFARI_ZONE] = {16, 2, 1, 1, sMapName_SafariZone}, - [MAPSEC_BATTLE_FRONTIER] = {22, 12, 1, 1, sMapName_BattleFrontier}, - [MAPSEC_PETALBURG_WOODS] = { 0, 8, 1, 1, sMapName_PetalburgWoods}, - [MAPSEC_RUSTURF_TUNNEL] = { 2, 5, 1, 1, sMapName_RusturfTunnel}, - [MAPSEC_ABANDONED_SHIP] = { 6, 14, 1, 1, sMapName_AbandonedShip}, - [MAPSEC_NEW_MAUVILLE] = { 8, 7, 1, 1, sMapName_NewMauville}, - [MAPSEC_METEOR_FALLS] = { 0, 3, 1, 1, sMapName_MeteorFalls}, - [MAPSEC_METEOR_FALLS2] = { 1, 2, 1, 1, sMapName_MeteorFalls}, - [MAPSEC_MT_PYRE] = {16, 4, 1, 1, sMapName_MtPyre}, - [MAPSEC_AQUA_HIDEOUT_OLD] = {19, 3, 1, 1, sMapName_AquaHideoutOld}, - [MAPSEC_SHOAL_CAVE] = {24, 4, 1, 1, sMapName_ShoalCave}, - [MAPSEC_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_SeafloorCavern}, - [MAPSEC_UNDERWATER_128] = {24, 9, 1, 1, sMapName_Underwater}, - [MAPSEC_VICTORY_ROAD] = {27, 9, 1, 1, sMapName_VictoryRoad}, - [MAPSEC_MIRAGE_ISLAND] = {17, 10, 1, 1, sMapName_MirageIsland}, - [MAPSEC_CAVE_OF_ORIGIN] = {21, 7, 1, 1, sMapName_CaveOfOrigin}, - [MAPSEC_SOUTHERN_ISLAND] = {12, 14, 1, 1, sMapName_SouthernIsland}, - [MAPSEC_FIERY_PATH] = { 6, 3, 1, 1, sMapName_FieryPath}, - [MAPSEC_FIERY_PATH2] = { 7, 3, 1, 1, sMapName_FieryPath}, - [MAPSEC_JAGGED_PASS] = { 6, 3, 1, 1, sMapName_JaggedPass}, - [MAPSEC_JAGGED_PASS2] = { 7, 2, 1, 1, sMapName_JaggedPass}, - [MAPSEC_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_SealedChamber}, - [MAPSEC_UNDERWATER_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_Underwater}, - [MAPSEC_SCORCHED_SLAB] = {13, 0, 1, 1, sMapName_ScorchedSlab}, - [MAPSEC_ISLAND_CAVE] = { 0, 10, 1, 1, sMapName_IslandCave}, - [MAPSEC_DESERT_RUINS] = { 8, 3, 1, 1, sMapName_DesertRuins}, - [MAPSEC_ANCIENT_TOMB] = {13, 2, 1, 1, sMapName_AncientTomb}, - [MAPSEC_INSIDE_OF_TRUCK] = { 0, 0, 1, 1, sMapName_InsideOfTruck}, - [MAPSEC_SKY_PILLAR] = {19, 10, 1, 1, sMapName_SkyPillar}, - [MAPSEC_SECRET_BASE] = { 0, 0, 1, 1, sMapName_SecretBase}, - [MAPSEC_DYNAMIC] = { 0, 0, 1, 1, sMapName_None}, - [MAPSEC_PALLET_TOWN] = { 0, 0, 1, 1, sMapName_PalletTown}, - [MAPSEC_VIRIDIAN_CITY] = { 0, 0, 1, 1, sMapName_ViridianCity}, - [MAPSEC_PEWTER_CITY] = { 0, 0, 1, 1, sMapName_PewterCity}, - [MAPSEC_CERULEAN_CITY] = { 0, 0, 1, 1, sMapName_CeruleanCity}, - [MAPSEC_LAVENDER_TOWN] = { 0, 0, 1, 1, sMapName_LavenderTown}, - [MAPSEC_VERMILION_CITY] = { 0, 0, 1, 1, sMapName_VermilionCity}, - [MAPSEC_CELADON_CITY] = { 0, 0, 1, 1, sMapName_CeladonCity}, - [MAPSEC_FUCHSIA_CITY] = { 0, 0, 1, 1, sMapName_FuchsiaCity}, - [MAPSEC_CINNABAR_ISLAND] = { 0, 0, 1, 1, sMapName_CinnabarIsland}, - [MAPSEC_INDIGO_PLATEAU] = { 0, 0, 1, 1, sMapName_IndigoPlateau}, - [MAPSEC_SAFFRON_CITY] = { 0, 0, 1, 1, sMapName_SaffronCity}, - [MAPSEC_ROUTE_4_FLYDUP] = { 0, 0, 1, 1, sMapName_Route4}, - [MAPSEC_ROUTE_10_FLYDUP] = { 0, 0, 1, 1, sMapName_Route10}, - [MAPSEC_ROUTE_1] = { 0, 0, 1, 1, sMapName_Route1}, - [MAPSEC_ROUTE_2] = { 0, 0, 1, 1, sMapName_Route2}, - [MAPSEC_ROUTE_3] = { 0, 0, 1, 1, sMapName_Route3}, - [MAPSEC_ROUTE_4] = { 0, 0, 1, 1, sMapName_Route4_2}, - [MAPSEC_ROUTE_5] = { 0, 0, 1, 1, sMapName_Route5}, - [MAPSEC_ROUTE_6] = { 0, 0, 1, 1, sMapName_Route6}, - [MAPSEC_ROUTE_7] = { 0, 0, 1, 1, sMapName_Route7}, - [MAPSEC_ROUTE_8] = { 0, 0, 1, 1, sMapName_Route8}, - [MAPSEC_ROUTE_9] = { 0, 0, 1, 1, sMapName_Route9}, - [MAPSEC_ROUTE_10] = { 0, 0, 1, 1, sMapName_Route10_2}, - [MAPSEC_ROUTE_11] = { 0, 0, 1, 1, sMapName_Route11}, - [MAPSEC_ROUTE_12] = { 0, 0, 1, 1, sMapName_Route12}, - [MAPSEC_ROUTE_13] = { 0, 0, 1, 1, sMapName_Route13}, - [MAPSEC_ROUTE_14] = { 0, 0, 1, 1, sMapName_Route14}, - [MAPSEC_ROUTE_15] = { 0, 0, 1, 1, sMapName_Route15}, - [MAPSEC_ROUTE_16] = { 0, 0, 1, 1, sMapName_Route16}, - [MAPSEC_ROUTE_17] = { 0, 0, 1, 1, sMapName_Route17}, - [MAPSEC_ROUTE_18] = { 0, 0, 1, 1, sMapName_Route18}, - [MAPSEC_ROUTE_19] = { 0, 0, 1, 1, sMapName_Route19}, - [MAPSEC_ROUTE_20] = { 0, 0, 1, 1, sMapName_Route20}, - [MAPSEC_ROUTE_21] = { 0, 0, 1, 1, sMapName_Route21}, - [MAPSEC_ROUTE_22] = { 0, 0, 1, 1, sMapName_Route22}, - [MAPSEC_ROUTE_23] = { 0, 0, 1, 1, sMapName_Route23}, - [MAPSEC_ROUTE_24] = { 0, 0, 1, 1, sMapName_Route24}, - [MAPSEC_ROUTE_25] = { 0, 0, 1, 1, sMapName_Route25}, - [MAPSEC_VIRIDIAN_FOREST] = { 0, 0, 1, 1, sMapName_ViridianForest}, - [MAPSEC_MT_MOON] = { 0, 0, 1, 1, sMapName_MtMoon}, - [MAPSEC_S_S_ANNE] = { 0, 0, 1, 1, sMapName_SSAnne}, - [MAPSEC_UNDERGROUND_PATH] = { 0, 0, 1, 1, sMapName_UndergroundPath}, - [MAPSEC_UNDERGROUND_PATH_2] = { 0, 0, 1, 1, sMapName_UndergroundPath2}, - [MAPSEC_DIGLETTS_CAVE] = { 0, 0, 1, 1, sMapName_DiglettsCave}, - [MAPSEC_KANTO_VICTORY_ROAD] = { 0, 0, 1, 1, sMapName_KantoVictoryRoad}, - [MAPSEC_ROCKET_HIDEOUT] = { 0, 0, 1, 1, sMapName_RocketHideout}, - [MAPSEC_SILPH_CO] = { 0, 0, 1, 1, sMapName_SilphCo}, - [MAPSEC_POKEMON_MANSION] = { 0, 0, 1, 1, sMapName_PokemonMansion}, - [MAPSEC_KANTO_SAFARI_ZONE] = { 0, 0, 1, 1, sMapName_KantoSafariZone}, - [MAPSEC_POKEMON_LEAGUE] = { 0, 0, 1, 1, sMapName_PokemonLeague}, - [MAPSEC_ROCK_TUNNEL] = { 0, 0, 1, 1, sMapName_RockTunnel}, - [MAPSEC_SEAFOAM_ISLANDS] = { 0, 0, 1, 1, sMapName_SeafoamIslands}, - [MAPSEC_POKEMON_TOWER] = { 0, 0, 1, 1, sMapName_PokemonTower}, - [MAPSEC_CERULEAN_CAVE] = { 0, 0, 1, 1, sMapName_CeruleanCave}, - [MAPSEC_POWER_PLANT] = { 0, 0, 1, 1, sMapName_PowerPlant}, - [MAPSEC_ONE_ISLAND] = { 0, 0, 1, 1, sMapName_OneIsland}, - [MAPSEC_TWO_ISLAND] = { 0, 0, 1, 1, sMapName_TwoIsland}, - [MAPSEC_THREE_ISLAND] = { 0, 0, 1, 1, sMapName_ThreeIsland}, - [MAPSEC_FOUR_ISLAND] = { 0, 0, 1, 1, sMapName_FourIsland}, - [MAPSEC_FIVE_ISLAND] = { 0, 0, 1, 1, sMapName_FiveIsland}, - [MAPSEC_SEVEN_ISLAND] = { 0, 0, 1, 1, sMapName_SevenIsland}, - [MAPSEC_SIX_ISLAND] = { 0, 0, 1, 1, sMapName_SixIsland}, - [MAPSEC_KINDLE_ROAD] = { 0, 0, 1, 1, sMapName_KindleRoad}, - [MAPSEC_TREASURE_BEACH] = { 0, 0, 1, 1, sMapName_TreasureBeach}, - [MAPSEC_CAPE_BRINK] = { 0, 0, 1, 1, sMapName_CapeBrink}, - [MAPSEC_BOND_BRIDGE] = { 0, 0, 1, 1, sMapName_BondBridge}, - [MAPSEC_THREE_ISLE_PORT] = { 0, 0, 1, 1, sMapName_ThreeIslePort}, - [MAPSEC_SEVII_ISLE_6] = { 0, 0, 1, 1, sMapName_SeviiIsle6}, - [MAPSEC_SEVII_ISLE_7] = { 0, 0, 1, 1, sMapName_SeviiIsle7}, - [MAPSEC_SEVII_ISLE_8] = { 0, 0, 1, 1, sMapName_SeviiIsle8}, - [MAPSEC_SEVII_ISLE_9] = { 0, 0, 1, 1, sMapName_SeviiIsle9}, - [MAPSEC_RESORT_GORGEOUS] = { 0, 0, 1, 1, sMapName_ResortGorgeous}, - [MAPSEC_WATER_LABYRINTH] = { 0, 0, 1, 1, sMapName_WaterLabyrinth}, - [MAPSEC_FIVE_ISLE_MEADOW] = { 0, 0, 1, 1, sMapName_FiveIsleMeadow}, - [MAPSEC_MEMORIAL_PILLAR] = { 0, 0, 1, 1, sMapName_MemorialPillar}, - [MAPSEC_OUTCAST_ISLAND] = { 0, 0, 1, 1, sMapName_OutcastIsland}, - [MAPSEC_GREEN_PATH] = { 0, 0, 1, 1, sMapName_GreenPath}, - [MAPSEC_WATER_PATH] = { 0, 0, 1, 1, sMapName_WaterPath}, - [MAPSEC_RUIN_VALLEY] = { 0, 0, 1, 1, sMapName_RuinValley}, - [MAPSEC_TRAINER_TOWER] = { 0, 0, 1, 1, sMapName_TrainerTower}, - [MAPSEC_CANYON_ENTRANCE] = { 0, 0, 1, 1, sMapName_CanyonEntrance}, - [MAPSEC_SEVAULT_CANYON] = { 0, 0, 1, 1, sMapName_SevaultCanyon}, - [MAPSEC_TANOBY_RUINS] = { 0, 0, 1, 1, sMapName_TanobyRuins}, - [MAPSEC_SEVII_ISLE_22] = { 0, 0, 1, 1, sMapName_SeviiIsle22}, - [MAPSEC_SEVII_ISLE_23] = { 0, 0, 1, 1, sMapName_SeviiIsle23}, - [MAPSEC_SEVII_ISLE_24] = { 0, 0, 1, 1, sMapName_SeviiIsle24}, - [MAPSEC_NAVEL_ROCK_FRLG] = { 0, 0, 1, 1, sMapName_NavelRock}, - [MAPSEC_MT_EMBER] = { 0, 0, 1, 1, sMapName_MtEmber}, - [MAPSEC_BERRY_FOREST] = { 0, 0, 1, 1, sMapName_BerryForest}, - [MAPSEC_ICEFALL_CAVE] = { 0, 0, 1, 1, sMapName_IcefallCave}, - [MAPSEC_ROCKET_WAREHOUSE] = { 0, 0, 1, 1, sMapName_RocketWarehouse}, - [MAPSEC_TRAINER_TOWER_2] = { 0, 0, 1, 1, sMapName_TrainerTower2}, - [MAPSEC_DOTTED_HOLE] = { 0, 0, 1, 1, sMapName_DottedHole}, - [MAPSEC_LOST_CAVE] = { 0, 0, 1, 1, sMapName_LostCave}, - [MAPSEC_PATTERN_BUSH] = { 0, 0, 1, 1, sMapName_PatternBush}, - [MAPSEC_ALTERING_CAVE_FRLG] = { 0, 0, 1, 1, sMapName_AlteringCave}, - [MAPSEC_TANOBY_CHAMBERS] = { 0, 0, 1, 1, sMapName_TanobyChambers}, - [MAPSEC_THREE_ISLE_PATH] = { 0, 0, 1, 1, sMapName_ThreeIslePath}, - [MAPSEC_TANOBY_KEY] = { 0, 0, 1, 1, sMapName_TanobyKey}, - [MAPSEC_BIRTH_ISLAND_FRLG] = { 0, 0, 1, 1, sMapName_BirthIsland}, - [MAPSEC_MONEAN_CHAMBER] = { 0, 0, 1, 1, sMapName_MoneanChamber}, - [MAPSEC_LIPTOO_CHAMBER] = { 0, 0, 1, 1, sMapName_LiptooChamber}, - [MAPSEC_WEEPTH_CHAMBER] = { 0, 0, 1, 1, sMapName_WeepthChamber}, - [MAPSEC_DILFORD_CHAMBER] = { 0, 0, 1, 1, sMapName_DilfordChamber}, - [MAPSEC_SCUFIB_CHAMBER] = { 0, 0, 1, 1, sMapName_ScufibChamber}, - [MAPSEC_RIXY_CHAMBER] = { 0, 0, 1, 1, sMapName_RixyChamber}, - [MAPSEC_VIAPOIS_CHAMBER] = { 0, 0, 1, 1, sMapName_ViapoisChamber}, - [MAPSEC_EMBER_SPA] = { 0, 0, 1, 1, sMapName_EmberSpa}, - [MAPSEC_SPECIAL_AREA] = { 0, 0, 1, 1, sMapName_SpecialArea}, - [MAPSEC_AQUA_HIDEOUT] = {19, 3, 1, 1, sMapName_AquaHideout}, - [MAPSEC_MAGMA_HIDEOUT] = { 6, 3, 1, 1, sMapName_MagmaHideout}, - [MAPSEC_MIRAGE_TOWER] = { 8, 2, 1, 1, sMapName_MirageTower}, - [MAPSEC_BIRTH_ISLAND] = { 0, 0, 1, 1, sMapName_BirthIsland}, - [MAPSEC_FARAWAY_ISLAND] = { 0, 0, 1, 1, sMapName_FarawayIsland}, - [MAPSEC_ARTISAN_CAVE] = {22, 12, 1, 1, sMapName_ArtisanCave}, - [MAPSEC_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_MarineCave}, - [MAPSEC_UNDERWATER_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_Underwater}, - [MAPSEC_TERRA_CAVE] = { 0, 0, 1, 1, sMapName_TerraCave}, - [MAPSEC_UNDERWATER_TERRA_CAVE] = { 0, 10, 1, 3, sMapName_Underwater}, - [MAPSEC_UNDERWATER_UNK1] = {24, 3, 2, 2, sMapName_Underwater}, - [MAPSEC_UNDERWATER_129] = {24, 10, 2, 1, sMapName_Underwater}, - [MAPSEC_DESERT_UNDERPASS] = { 2, 0, 1, 1, sMapName_DesertUnderpass}, - [MAPSEC_ALTERING_CAVE] = { 6, 8, 1, 1, sMapName_AlteringCave}, - [MAPSEC_NAVEL_ROCK] = { 0, 0, 1, 1, sMapName_NavelRock}, - [MAPSEC_TRAINER_HILL] = { 8, 4, 1, 1, sMapName_TrainerHill} + [MAPSEC_LITTLEROOT_TOWN] = { 4, 11, 1, 1, sMapName_LittlerootTown}, + [MAPSEC_OLDALE_TOWN] = { 4, 9, 1, 1, sMapName_OldaleTown}, + [MAPSEC_DEWFORD_TOWN] = { 2, 14, 1, 1, sMapName_DewfordTown}, + [MAPSEC_LAVARIDGE_TOWN] = { 5, 3, 1, 1, sMapName_LavaridgeTown}, + [MAPSEC_FALLARBOR_TOWN] = { 3, 0, 1, 1, sMapName_FallarborTown}, + [MAPSEC_VERDANTURF_TOWN] = { 4, 6, 1, 1, sMapName_VerdanturfTown}, + [MAPSEC_PACIFIDLOG_TOWN] = {17, 10, 1, 1, sMapName_PacifidlogTown}, + [MAPSEC_PETALBURG_CITY] = { 1, 9, 1, 1, sMapName_PetalburgCity}, + [MAPSEC_SLATEPORT_CITY] = { 8, 10, 1, 2, sMapName_SlateportCity}, + [MAPSEC_MAUVILLE_CITY] = { 8, 6, 2, 1, sMapName_MauvilleCity}, + [MAPSEC_RUSTBORO_CITY] = { 0, 5, 1, 2, sMapName_RustboroCity}, + [MAPSEC_FORTREE_CITY] = {12, 0, 1, 1, sMapName_FortreeCity}, + [MAPSEC_LILYCOVE_CITY] = {18, 3, 2, 1, sMapName_LilycoveCity}, + [MAPSEC_MOSSDEEP_CITY] = {24, 5, 2, 1, sMapName_MossdeepCity}, + [MAPSEC_SOOTOPOLIS_CITY] = {21, 7, 1, 1, sMapName_SootopolisCity}, + [MAPSEC_EVER_GRANDE_CITY] = {27, 8, 1, 2, sMapName_EverGrandeCity}, + [MAPSEC_ROUTE_101] = { 4, 10, 1, 1, sMapName_Route101}, + [MAPSEC_ROUTE_102] = { 2, 9, 2, 1, sMapName_Route102}, + [MAPSEC_ROUTE_103] = { 4, 8, 4, 1, sMapName_Route103}, + [MAPSEC_ROUTE_104] = { 0, 7, 1, 3, sMapName_Route104}, + [MAPSEC_ROUTE_105] = { 0, 10, 1, 3, sMapName_Route105}, + [MAPSEC_ROUTE_106] = { 0, 13, 2, 1, sMapName_Route106}, + [MAPSEC_ROUTE_107] = { 3, 14, 3, 1, sMapName_Route107}, + [MAPSEC_ROUTE_108] = { 6, 14, 2, 1, sMapName_Route108}, + [MAPSEC_ROUTE_109] = { 8, 12, 1, 3, sMapName_Route109}, + [MAPSEC_ROUTE_110] = { 8, 7, 1, 3, sMapName_Route110}, + [MAPSEC_ROUTE_111] = { 8, 0, 1, 6, sMapName_Route111}, + [MAPSEC_ROUTE_112] = { 6, 3, 2, 1, sMapName_Route112}, + [MAPSEC_ROUTE_113] = { 4, 0, 4, 1, sMapName_Route113}, + [MAPSEC_ROUTE_114] = { 1, 0, 2, 3, sMapName_Route114}, + [MAPSEC_ROUTE_115] = { 0, 2, 1, 3, sMapName_Route115}, + [MAPSEC_ROUTE_116] = { 1, 5, 4, 1, sMapName_Route116}, + [MAPSEC_ROUTE_117] = { 5, 6, 3, 1, sMapName_Route117}, + [MAPSEC_ROUTE_118] = {10, 6, 2, 1, sMapName_Route118}, + [MAPSEC_ROUTE_119] = {11, 0, 1, 6, sMapName_Route119}, + [MAPSEC_ROUTE_120] = {13, 0, 1, 4, sMapName_Route120}, + [MAPSEC_ROUTE_121] = {14, 3, 4, 1, sMapName_Route121}, + [MAPSEC_ROUTE_122] = {16, 4, 1, 2, sMapName_Route122}, + [MAPSEC_ROUTE_123] = {12, 6, 5, 1, sMapName_Route123}, + [MAPSEC_ROUTE_124] = {20, 3, 4, 3, sMapName_Route124}, + [MAPSEC_ROUTE_125] = {24, 3, 2, 2, sMapName_Route125}, + [MAPSEC_ROUTE_126] = {20, 6, 3, 3, sMapName_Route126}, + [MAPSEC_ROUTE_127] = {23, 6, 3, 3, sMapName_Route127}, + [MAPSEC_ROUTE_128] = {23, 9, 4, 1, sMapName_Route128}, + [MAPSEC_ROUTE_129] = {24, 10, 2, 1, sMapName_Route129}, + [MAPSEC_ROUTE_130] = {21, 10, 3, 1, sMapName_Route130}, + [MAPSEC_ROUTE_131] = {18, 10, 3, 1, sMapName_Route131}, + [MAPSEC_ROUTE_132] = {15, 10, 2, 1, sMapName_Route132}, + [MAPSEC_ROUTE_133] = {12, 10, 3, 1, sMapName_Route133}, + [MAPSEC_ROUTE_134] = { 9, 10, 3, 1, sMapName_Route134}, + [MAPSEC_UNDERWATER_124] = {20, 3, 4, 3, sMapName_Underwater}, + [MAPSEC_UNDERWATER_126] = {20, 6, 3, 3, sMapName_Underwater}, + [MAPSEC_UNDERWATER_127] = {23, 6, 3, 3, sMapName_Underwater}, + [MAPSEC_UNDERWATER_128] = {23, 9, 4, 1, sMapName_Underwater}, + [MAPSEC_UNDERWATER_SOOTOPOLIS] = {21, 7, 1, 1, sMapName_Underwater}, + [MAPSEC_GRANITE_CAVE] = { 1, 13, 1, 1, sMapName_GraniteCave}, + [MAPSEC_MT_CHIMNEY] = { 6, 2, 1, 1, sMapName_MtChimney}, + [MAPSEC_SAFARI_ZONE] = {16, 2, 1, 1, sMapName_SafariZone}, + [MAPSEC_BATTLE_FRONTIER] = {22, 12, 1, 1, sMapName_BattleFrontier}, + [MAPSEC_PETALBURG_WOODS] = { 0, 8, 1, 1, sMapName_PetalburgWoods}, + [MAPSEC_RUSTURF_TUNNEL] = { 2, 5, 1, 1, sMapName_RusturfTunnel}, + [MAPSEC_ABANDONED_SHIP] = { 6, 14, 1, 1, sMapName_AbandonedShip}, + [MAPSEC_NEW_MAUVILLE] = { 8, 7, 1, 1, sMapName_NewMauville}, + [MAPSEC_METEOR_FALLS] = { 0, 3, 1, 1, sMapName_MeteorFalls}, + [MAPSEC_METEOR_FALLS2] = { 1, 2, 1, 1, sMapName_MeteorFalls}, + [MAPSEC_MT_PYRE] = {16, 4, 1, 1, sMapName_MtPyre}, + [MAPSEC_AQUA_HIDEOUT_OLD] = {19, 3, 1, 1, sMapName_AquaHideoutOld}, + [MAPSEC_SHOAL_CAVE] = {24, 4, 1, 1, sMapName_ShoalCave}, + [MAPSEC_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_SeafloorCavern}, + [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_Underwater}, + [MAPSEC_VICTORY_ROAD] = {27, 9, 1, 1, sMapName_VictoryRoad}, + [MAPSEC_MIRAGE_ISLAND] = {17, 10, 1, 1, sMapName_MirageIsland}, + [MAPSEC_CAVE_OF_ORIGIN] = {21, 7, 1, 1, sMapName_CaveOfOrigin}, + [MAPSEC_SOUTHERN_ISLAND] = {12, 14, 1, 1, sMapName_SouthernIsland}, + [MAPSEC_FIERY_PATH] = { 6, 3, 1, 1, sMapName_FieryPath}, + [MAPSEC_FIERY_PATH2] = { 7, 3, 1, 1, sMapName_FieryPath}, + [MAPSEC_JAGGED_PASS] = { 6, 3, 1, 1, sMapName_JaggedPass}, + [MAPSEC_JAGGED_PASS2] = { 7, 2, 1, 1, sMapName_JaggedPass}, + [MAPSEC_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_SealedChamber}, + [MAPSEC_UNDERWATER_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_Underwater}, + [MAPSEC_SCORCHED_SLAB] = {13, 0, 1, 1, sMapName_ScorchedSlab}, + [MAPSEC_ISLAND_CAVE] = { 0, 10, 1, 1, sMapName_IslandCave}, + [MAPSEC_DESERT_RUINS] = { 8, 3, 1, 1, sMapName_DesertRuins}, + [MAPSEC_ANCIENT_TOMB] = {13, 2, 1, 1, sMapName_AncientTomb}, + [MAPSEC_INSIDE_OF_TRUCK] = { 0, 0, 1, 1, sMapName_InsideOfTruck}, + [MAPSEC_SKY_PILLAR] = {19, 10, 1, 1, sMapName_SkyPillar}, + [MAPSEC_SECRET_BASE] = { 0, 0, 1, 1, sMapName_SecretBase}, + [MAPSEC_DYNAMIC] = { 0, 0, 1, 1, sMapName_None}, + [MAPSEC_PALLET_TOWN] = { 0, 0, 1, 1, sMapName_PalletTown}, + [MAPSEC_VIRIDIAN_CITY] = { 0, 0, 1, 1, sMapName_ViridianCity}, + [MAPSEC_PEWTER_CITY] = { 0, 0, 1, 1, sMapName_PewterCity}, + [MAPSEC_CERULEAN_CITY] = { 0, 0, 1, 1, sMapName_CeruleanCity}, + [MAPSEC_LAVENDER_TOWN] = { 0, 0, 1, 1, sMapName_LavenderTown}, + [MAPSEC_VERMILION_CITY] = { 0, 0, 1, 1, sMapName_VermilionCity}, + [MAPSEC_CELADON_CITY] = { 0, 0, 1, 1, sMapName_CeladonCity}, + [MAPSEC_FUCHSIA_CITY] = { 0, 0, 1, 1, sMapName_FuchsiaCity}, + [MAPSEC_CINNABAR_ISLAND] = { 0, 0, 1, 1, sMapName_CinnabarIsland}, + [MAPSEC_INDIGO_PLATEAU] = { 0, 0, 1, 1, sMapName_IndigoPlateau}, + [MAPSEC_SAFFRON_CITY] = { 0, 0, 1, 1, sMapName_SaffronCity}, + [MAPSEC_ROUTE_4_FLYDUP] = { 0, 0, 1, 1, sMapName_Route4}, + [MAPSEC_ROUTE_10_FLYDUP] = { 0, 0, 1, 1, sMapName_Route10}, + [MAPSEC_ROUTE_1] = { 0, 0, 1, 1, sMapName_Route1}, + [MAPSEC_ROUTE_2] = { 0, 0, 1, 1, sMapName_Route2}, + [MAPSEC_ROUTE_3] = { 0, 0, 1, 1, sMapName_Route3}, + [MAPSEC_ROUTE_4] = { 0, 0, 1, 1, sMapName_Route4_2}, + [MAPSEC_ROUTE_5] = { 0, 0, 1, 1, sMapName_Route5}, + [MAPSEC_ROUTE_6] = { 0, 0, 1, 1, sMapName_Route6}, + [MAPSEC_ROUTE_7] = { 0, 0, 1, 1, sMapName_Route7}, + [MAPSEC_ROUTE_8] = { 0, 0, 1, 1, sMapName_Route8}, + [MAPSEC_ROUTE_9] = { 0, 0, 1, 1, sMapName_Route9}, + [MAPSEC_ROUTE_10] = { 0, 0, 1, 1, sMapName_Route10_2}, + [MAPSEC_ROUTE_11] = { 0, 0, 1, 1, sMapName_Route11}, + [MAPSEC_ROUTE_12] = { 0, 0, 1, 1, sMapName_Route12}, + [MAPSEC_ROUTE_13] = { 0, 0, 1, 1, sMapName_Route13}, + [MAPSEC_ROUTE_14] = { 0, 0, 1, 1, sMapName_Route14}, + [MAPSEC_ROUTE_15] = { 0, 0, 1, 1, sMapName_Route15}, + [MAPSEC_ROUTE_16] = { 0, 0, 1, 1, sMapName_Route16}, + [MAPSEC_ROUTE_17] = { 0, 0, 1, 1, sMapName_Route17}, + [MAPSEC_ROUTE_18] = { 0, 0, 1, 1, sMapName_Route18}, + [MAPSEC_ROUTE_19] = { 0, 0, 1, 1, sMapName_Route19}, + [MAPSEC_ROUTE_20] = { 0, 0, 1, 1, sMapName_Route20}, + [MAPSEC_ROUTE_21] = { 0, 0, 1, 1, sMapName_Route21}, + [MAPSEC_ROUTE_22] = { 0, 0, 1, 1, sMapName_Route22}, + [MAPSEC_ROUTE_23] = { 0, 0, 1, 1, sMapName_Route23}, + [MAPSEC_ROUTE_24] = { 0, 0, 1, 1, sMapName_Route24}, + [MAPSEC_ROUTE_25] = { 0, 0, 1, 1, sMapName_Route25}, + [MAPSEC_VIRIDIAN_FOREST] = { 0, 0, 1, 1, sMapName_ViridianForest}, + [MAPSEC_MT_MOON] = { 0, 0, 1, 1, sMapName_MtMoon}, + [MAPSEC_S_S_ANNE] = { 0, 0, 1, 1, sMapName_SSAnne}, + [MAPSEC_UNDERGROUND_PATH] = { 0, 0, 1, 1, sMapName_UndergroundPath}, + [MAPSEC_UNDERGROUND_PATH_2] = { 0, 0, 1, 1, sMapName_UndergroundPath2}, + [MAPSEC_DIGLETTS_CAVE] = { 0, 0, 1, 1, sMapName_DiglettsCave}, + [MAPSEC_KANTO_VICTORY_ROAD] = { 0, 0, 1, 1, sMapName_KantoVictoryRoad}, + [MAPSEC_ROCKET_HIDEOUT] = { 0, 0, 1, 1, sMapName_RocketHideout}, + [MAPSEC_SILPH_CO] = { 0, 0, 1, 1, sMapName_SilphCo}, + [MAPSEC_POKEMON_MANSION] = { 0, 0, 1, 1, sMapName_PokemonMansion}, + [MAPSEC_KANTO_SAFARI_ZONE] = { 0, 0, 1, 1, sMapName_KantoSafariZone}, + [MAPSEC_POKEMON_LEAGUE] = { 0, 0, 1, 1, sMapName_PokemonLeague}, + [MAPSEC_ROCK_TUNNEL] = { 0, 0, 1, 1, sMapName_RockTunnel}, + [MAPSEC_SEAFOAM_ISLANDS] = { 0, 0, 1, 1, sMapName_SeafoamIslands}, + [MAPSEC_POKEMON_TOWER] = { 0, 0, 1, 1, sMapName_PokemonTower}, + [MAPSEC_CERULEAN_CAVE] = { 0, 0, 1, 1, sMapName_CeruleanCave}, + [MAPSEC_POWER_PLANT] = { 0, 0, 1, 1, sMapName_PowerPlant}, + [MAPSEC_ONE_ISLAND] = { 0, 0, 1, 1, sMapName_OneIsland}, + [MAPSEC_TWO_ISLAND] = { 0, 0, 1, 1, sMapName_TwoIsland}, + [MAPSEC_THREE_ISLAND] = { 0, 0, 1, 1, sMapName_ThreeIsland}, + [MAPSEC_FOUR_ISLAND] = { 0, 0, 1, 1, sMapName_FourIsland}, + [MAPSEC_FIVE_ISLAND] = { 0, 0, 1, 1, sMapName_FiveIsland}, + [MAPSEC_SEVEN_ISLAND] = { 0, 0, 1, 1, sMapName_SevenIsland}, + [MAPSEC_SIX_ISLAND] = { 0, 0, 1, 1, sMapName_SixIsland}, + [MAPSEC_KINDLE_ROAD] = { 0, 0, 1, 1, sMapName_KindleRoad}, + [MAPSEC_TREASURE_BEACH] = { 0, 0, 1, 1, sMapName_TreasureBeach}, + [MAPSEC_CAPE_BRINK] = { 0, 0, 1, 1, sMapName_CapeBrink}, + [MAPSEC_BOND_BRIDGE] = { 0, 0, 1, 1, sMapName_BondBridge}, + [MAPSEC_THREE_ISLE_PORT] = { 0, 0, 1, 1, sMapName_ThreeIslePort}, + [MAPSEC_SEVII_ISLE_6] = { 0, 0, 1, 1, sMapName_SeviiIsle6}, + [MAPSEC_SEVII_ISLE_7] = { 0, 0, 1, 1, sMapName_SeviiIsle7}, + [MAPSEC_SEVII_ISLE_8] = { 0, 0, 1, 1, sMapName_SeviiIsle8}, + [MAPSEC_SEVII_ISLE_9] = { 0, 0, 1, 1, sMapName_SeviiIsle9}, + [MAPSEC_RESORT_GORGEOUS] = { 0, 0, 1, 1, sMapName_ResortGorgeous}, + [MAPSEC_WATER_LABYRINTH] = { 0, 0, 1, 1, sMapName_WaterLabyrinth}, + [MAPSEC_FIVE_ISLE_MEADOW] = { 0, 0, 1, 1, sMapName_FiveIsleMeadow}, + [MAPSEC_MEMORIAL_PILLAR] = { 0, 0, 1, 1, sMapName_MemorialPillar}, + [MAPSEC_OUTCAST_ISLAND] = { 0, 0, 1, 1, sMapName_OutcastIsland}, + [MAPSEC_GREEN_PATH] = { 0, 0, 1, 1, sMapName_GreenPath}, + [MAPSEC_WATER_PATH] = { 0, 0, 1, 1, sMapName_WaterPath}, + [MAPSEC_RUIN_VALLEY] = { 0, 0, 1, 1, sMapName_RuinValley}, + [MAPSEC_TRAINER_TOWER] = { 0, 0, 1, 1, sMapName_TrainerTower}, + [MAPSEC_CANYON_ENTRANCE] = { 0, 0, 1, 1, sMapName_CanyonEntrance}, + [MAPSEC_SEVAULT_CANYON] = { 0, 0, 1, 1, sMapName_SevaultCanyon}, + [MAPSEC_TANOBY_RUINS] = { 0, 0, 1, 1, sMapName_TanobyRuins}, + [MAPSEC_SEVII_ISLE_22] = { 0, 0, 1, 1, sMapName_SeviiIsle22}, + [MAPSEC_SEVII_ISLE_23] = { 0, 0, 1, 1, sMapName_SeviiIsle23}, + [MAPSEC_SEVII_ISLE_24] = { 0, 0, 1, 1, sMapName_SeviiIsle24}, + [MAPSEC_NAVEL_ROCK_FRLG] = { 0, 0, 1, 1, sMapName_NavelRock}, + [MAPSEC_MT_EMBER] = { 0, 0, 1, 1, sMapName_MtEmber}, + [MAPSEC_BERRY_FOREST] = { 0, 0, 1, 1, sMapName_BerryForest}, + [MAPSEC_ICEFALL_CAVE] = { 0, 0, 1, 1, sMapName_IcefallCave}, + [MAPSEC_ROCKET_WAREHOUSE] = { 0, 0, 1, 1, sMapName_RocketWarehouse}, + [MAPSEC_TRAINER_TOWER_2] = { 0, 0, 1, 1, sMapName_TrainerTower2}, + [MAPSEC_DOTTED_HOLE] = { 0, 0, 1, 1, sMapName_DottedHole}, + [MAPSEC_LOST_CAVE] = { 0, 0, 1, 1, sMapName_LostCave}, + [MAPSEC_PATTERN_BUSH] = { 0, 0, 1, 1, sMapName_PatternBush}, + [MAPSEC_ALTERING_CAVE_FRLG] = { 0, 0, 1, 1, sMapName_AlteringCave}, + [MAPSEC_TANOBY_CHAMBERS] = { 0, 0, 1, 1, sMapName_TanobyChambers}, + [MAPSEC_THREE_ISLE_PATH] = { 0, 0, 1, 1, sMapName_ThreeIslePath}, + [MAPSEC_TANOBY_KEY] = { 0, 0, 1, 1, sMapName_TanobyKey}, + [MAPSEC_BIRTH_ISLAND_FRLG] = { 0, 0, 1, 1, sMapName_BirthIsland}, + [MAPSEC_MONEAN_CHAMBER] = { 0, 0, 1, 1, sMapName_MoneanChamber}, + [MAPSEC_LIPTOO_CHAMBER] = { 0, 0, 1, 1, sMapName_LiptooChamber}, + [MAPSEC_WEEPTH_CHAMBER] = { 0, 0, 1, 1, sMapName_WeepthChamber}, + [MAPSEC_DILFORD_CHAMBER] = { 0, 0, 1, 1, sMapName_DilfordChamber}, + [MAPSEC_SCUFIB_CHAMBER] = { 0, 0, 1, 1, sMapName_ScufibChamber}, + [MAPSEC_RIXY_CHAMBER] = { 0, 0, 1, 1, sMapName_RixyChamber}, + [MAPSEC_VIAPOIS_CHAMBER] = { 0, 0, 1, 1, sMapName_ViapoisChamber}, + [MAPSEC_EMBER_SPA] = { 0, 0, 1, 1, sMapName_EmberSpa}, + [MAPSEC_SPECIAL_AREA] = { 0, 0, 1, 1, sMapName_SpecialArea}, + [MAPSEC_AQUA_HIDEOUT] = {19, 3, 1, 1, sMapName_AquaHideout}, + [MAPSEC_MAGMA_HIDEOUT] = { 6, 3, 1, 1, sMapName_MagmaHideout}, + [MAPSEC_MIRAGE_TOWER] = { 8, 2, 1, 1, sMapName_MirageTower}, + [MAPSEC_BIRTH_ISLAND] = { 0, 0, 1, 1, sMapName_BirthIsland}, + [MAPSEC_FARAWAY_ISLAND] = { 0, 0, 1, 1, sMapName_FarawayIsland}, + [MAPSEC_ARTISAN_CAVE] = {22, 12, 1, 1, sMapName_ArtisanCave}, + [MAPSEC_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_MarineCave}, + [MAPSEC_UNDERWATER_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_Underwater}, + [MAPSEC_TERRA_CAVE] = { 0, 0, 1, 1, sMapName_TerraCave}, + [MAPSEC_UNDERWATER_105] = { 0, 10, 1, 3, sMapName_Underwater}, + [MAPSEC_UNDERWATER_125] = {24, 3, 2, 2, sMapName_Underwater}, + [MAPSEC_UNDERWATER_129] = {24, 10, 2, 1, sMapName_Underwater}, + [MAPSEC_DESERT_UNDERPASS] = { 2, 0, 1, 1, sMapName_DesertUnderpass}, + [MAPSEC_ALTERING_CAVE] = { 6, 8, 1, 1, sMapName_AlteringCave}, + [MAPSEC_NAVEL_ROCK] = { 0, 0, 1, 1, sMapName_NavelRock}, + [MAPSEC_TRAINER_HILL] = { 8, 4, 1, 1, sMapName_TrainerHill} }; #endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index b27de4513a..0b30c0f65b 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -2265,8 +2265,8 @@ } }, { - "map": "MAP_UNDERWATER2", - "base_label": "gUnderwater2", + "map": "MAP_UNDERWATER_ROUTE126", + "base_label": "gUnderwater_Route126", "water_mons": { "encounter_rate": 4, "mons": [ @@ -9075,8 +9075,8 @@ } }, { - "map": "MAP_UNDERWATER1", - "base_label": "gUnderwater1", + "map": "MAP_UNDERWATER_ROUTE124", + "base_label": "gUnderwater_Route124", "water_mons": { "encounter_rate": 4, "mons": [ diff --git a/src/daycare.c b/src/daycare.c index 5d44804039..69043a5139 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1186,7 +1186,7 @@ static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y) printer.y = y; printer.currentX = x; printer.currentY = y; - printer.unk = 0; + printer.style = 0; gTextFlags.useAlternateDownArrow = 0; printer.letterSpacing = 0; printer.lineSpacing = 1; @@ -1237,7 +1237,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) { u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (input) { @@ -1255,7 +1255,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) DestroyTask(taskId); EnableBothScriptContexts(); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { gSpecialVar_Result = DAYCARE_EXITED_LEVEL_MENU; DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL); diff --git a/src/decoration.c b/src/decoration.c index f566cc7c92..22ae327f9e 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1147,7 +1147,7 @@ static void DontTossDecoration(u8 taskId) static void ReturnToDecorationItemsAfterInvalidSelection(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { ClearDialogWindowAndFrame(0, 0); AddDecorationWindow(WINDOW_DECORATION_CATEGORIES); @@ -1623,7 +1623,7 @@ static void AttemptPlaceDecoration_(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); StringExpandPlaceholders(gStringVar4, gText_CantBePlacedHere); DisplayItemMessageOnField(taskId, gStringVar4, CantPlaceDecorationPrompt); } @@ -1803,7 +1803,7 @@ static bool8 ApplyCursorMovement_IsInvalid(u8 taskId) static bool8 IsHoldingDirection(void) { - u16 heldKeys = gMain.heldKeys & DPAD_ANY; + u16 heldKeys = JOY_HELD(DPAD_ANY); if (heldKeys != DPAD_UP && heldKeys != DPAD_DOWN && heldKeys != DPAD_LEFT && heldKeys != DPAD_RIGHT) return FALSE; @@ -1827,13 +1827,14 @@ static void Task_SelectLocation(u8 taskId) sPlacePutAwayYesNoFunctions[tDecorationItemsMenuCommand].yesFunc(taskId); return; } - else if (tButton == B_BUTTON) + + if (tButton == B_BUTTON) { sPlacePutAwayYesNoFunctions[tDecorationItemsMenuCommand].noFunc(taskId); return; } - if ((gMain.heldKeys & DPAD_ANY) == DPAD_UP) + if ((JOY_HELD(DPAD_ANY)) == DPAD_UP) { sDecorationLastDirectionMoved = DIR_SOUTH; gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = 0; @@ -1841,7 +1842,7 @@ static void Task_SelectLocation(u8 taskId) tCursorY--; } - if ((gMain.heldKeys & DPAD_ANY) == DPAD_DOWN) + if ((JOY_HELD(DPAD_ANY)) == DPAD_DOWN) { sDecorationLastDirectionMoved = DIR_NORTH; gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = 0; @@ -1849,7 +1850,7 @@ static void Task_SelectLocation(u8 taskId) tCursorY++; } - if ((gMain.heldKeys & DPAD_ANY) == DPAD_LEFT) + if ((JOY_HELD(DPAD_ANY)) == DPAD_LEFT) { sDecorationLastDirectionMoved = DIR_WEST; gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = -2; @@ -1857,7 +1858,7 @@ static void Task_SelectLocation(u8 taskId) tCursorX--; } - if ((gMain.heldKeys & DPAD_ANY) == DPAD_RIGHT) + if ((JOY_HELD(DPAD_ANY)) == DPAD_RIGHT) { sDecorationLastDirectionMoved = DIR_EAST; gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = 2; @@ -1877,10 +1878,10 @@ static void Task_SelectLocation(u8 taskId) if (!tButton) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) tButton = A_BUTTON; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) tButton = B_BUTTON; } } @@ -1895,7 +1896,7 @@ static void ContinueDecorating(u8 taskId) static void CantPlaceDecorationPrompt(u8 taskId) { - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) ContinueDecorating(taskId); } @@ -1928,7 +1929,7 @@ static void CopyTile(u8 *dest, u16 tile) case BG_TILE_H_FLIP(0) >> 10: for (i = 0; i < 8; i++) { - dest[4 * i] = (buffer[4 * (i + 1) - 1] >> 4) + ((buffer[4 * (i + 1) - 1] & 0x0F) << 4); + dest[4 * i + 0] = (buffer[4 * (i + 1) - 1] >> 4) + ((buffer[4 * (i + 1) - 1] & 0x0F) << 4); dest[4 * i + 1] = (buffer[4 * (i + 1) - 2] >> 4) + ((buffer[4 * (i + 1) - 2] & 0x0F) << 4); dest[4 * i + 2] = (buffer[4 * (i + 1) - 3] >> 4) + ((buffer[4 * (i + 1) - 3] & 0x0F) << 4); dest[4 * i + 3] = (buffer[4 * (i + 1) - 4] >> 4) + ((buffer[4 * (i + 1) - 4] & 0x0F) << 4); @@ -1937,7 +1938,7 @@ static void CopyTile(u8 *dest, u16 tile) case BG_TILE_V_FLIP(0) >> 10: for (i = 0; i < 8; i++) { - dest[4 * i] = buffer[4 * (7 - i)]; + dest[4 * i + 0] = buffer[4 * (7 - i) + 0]; dest[4 * i + 1] = buffer[4 * (7 - i) + 1]; dest[4 * i + 2] = buffer[4 * (7 - i) + 2]; dest[4 * i + 3] = buffer[4 * (7 - i) + 3]; @@ -2386,7 +2387,7 @@ static void AttemptPutAwayDecoration_(u8 taskId) static void ContinuePuttingAwayDecorationsPrompt(u8 taskId) { - if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) ContinuePuttingAwayDecorations(taskId); } diff --git a/src/diploma.c b/src/diploma.c index 7eb3b0e81d..f243d09f96 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -107,7 +107,7 @@ static void Task_DiplomaFadeIn(u8 taskId) static void Task_DiplomaWaitForKeyPress(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_DiplomaFadeOut; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 41d8aa4192..9cbc73c73e 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -467,7 +467,7 @@ void StartDodrioBerryPicking(u16 a0, void (*callback)(void)) sub_80273F0(); sub_8026B5C(gUnknown_02022C98->unk24, &gUnknown_02022C98->unk44, &gUnknown_02022C98->unk48); StopMapMusic(); - PlayNewMapMusic(MUS_RG_KINOMIKUI); + PlayNewMapMusic(MUS_RG_BERRY_PICK); } else { @@ -877,7 +877,7 @@ static void sub_8025198(void) if (WaitFanfare(TRUE)) { sub_8026240(6); - FadeOutAndPlayNewMapMusic(MUS_RG_WIN_YASEI, 4); + FadeOutAndPlayNewMapMusic(MUS_RG_VICTORY_WILD, 4); } break; } @@ -916,7 +916,7 @@ static void sub_8025230(void) if (WaitFanfare(TRUE)) { gUnknown_02022C98->unk114 = gUnknown_02022C98->unk4A[gUnknown_02022C98->multiplayerId][5]; sub_8026240(6); - FadeOutAndPlayNewMapMusic(MUS_RG_WIN_YASEI, 4); + FadeOutAndPlayNewMapMusic(MUS_RG_VICTORY_WILD, 4); } break; } @@ -1174,7 +1174,7 @@ static void sub_8025758(void) gUnknown_02022C98->unk10++; break; case 4: - PlayNewMapMusic(MUS_RG_KINOMIKUI); + PlayNewMapMusic(MUS_RG_BERRY_PICK); sub_8028E4C(); gUnknown_02022C98->unk10++; break; @@ -1458,8 +1458,8 @@ static void sub_8025F48(void) { if (gUnknown_02022C98->unk144 == 0) { - m4aSongNumStop(SE_SEIKAI); - PlaySE(SE_SEIKAI); + m4aSongNumStop(SE_SUCCESS); + PlaySE(SE_SUCCESS); gUnknown_02022C98->unk144 = 1; } } @@ -1480,7 +1480,7 @@ static void sub_8025F48(void) } else if (gUnknown_02022C98->unk154 == 1) { - PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN + PlayFanfareByFanfareNum(11); // MUS_TOO_BAD gUnknown_02022C98->unk154 = 2; } } @@ -1501,8 +1501,8 @@ static void sub_8026044(void) { if (gUnknown_02022C98->unk144 == 0) { - m4aSongNumStop(SE_SEIKAI); - PlaySE(SE_SEIKAI); + m4aSongNumStop(SE_SUCCESS); + PlaySE(SE_SUCCESS); gUnknown_02022C98->unk144 = 1; } } @@ -1522,7 +1522,7 @@ static void sub_8026044(void) { if (gUnknown_02022C98->unk148[r4] == 0) { - PlaySE(SE_FUUSEN1 + ptr->unk0[r4]); + PlaySE(SE_BALLOON_RED + ptr->unk0[r4]); gUnknown_02022C98->unk148[r4] = 1; } } @@ -1538,7 +1538,7 @@ static void sub_8026044(void) } else if (gUnknown_02022C98->unk154 == 1) { - PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN + PlayFanfareByFanfareNum(11); // MUS_TOO_BAD gUnknown_02022C98->unk154 = 2; } } @@ -1792,7 +1792,7 @@ static void sub_802671C(void) if (gUnknown_02022C98->unk148[i] == 0) { gUnknown_02022C98->unk148[i] = 1; - PlaySE(SE_FUUSEN1 + ptr->unk32CC.unk14.unk0[i]); + PlaySE(SE_BALLOON_RED + ptr->unk32CC.unk14.unk0[i]); } if (gUnknown_02022C98->unk40 < 10 || r10 == 1) { @@ -2355,23 +2355,23 @@ static void sub_8027554(void) { if (gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] == 0) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 2; gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 3; gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 1; gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } else { @@ -2653,7 +2653,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId) data[0]++; break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { rbox_fill_rectangle(data[1]); CopyWindowToVram(data[1], 1); @@ -2748,14 +2748,14 @@ static void sub_8027DD0(u32 arg0) struct UnkPacket1 packet; packet.id = 1; packet.unk4 = arg0; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static u32 sub_8027DFC(u32 arg0) { struct UnkPacket1 *packet; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) return 0; packet = (void *)&gRecvCmds[arg0][1]; @@ -2857,7 +2857,7 @@ static void sub_8027E30(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruc packet.unkA_3 = arg6; packet.unkB_1 = arg7; packet.unkB_0 = arg8; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static u32 sub_8028164(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8) @@ -2865,7 +2865,7 @@ static u32 sub_8028164(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct Dod struct UnkPacket2 *packet; struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) return 0; packet = (void *)&gRecvCmds[0][1]; @@ -2935,14 +2935,14 @@ static void sub_80282EC(u8 arg0) struct UnkPacket3 packet; packet.id = 3; packet.unk4 = arg0; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static u32 sub_8028318(u32 arg0, u8 *arg1) { struct UnkPacket3 *packet; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) return 0; packet = (void *)&gRecvCmds[arg0][1]; @@ -2966,14 +2966,14 @@ static void sub_8028350(u32 arg0) struct UnkPacket4 packet; packet.id = 4; packet.unk4 = arg0; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static u32 sub_8028374(u32 arg0) { struct UnkPacket4 *packet; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) return 0; packet = (void *)&gRecvCmds[arg0][1]; @@ -3450,7 +3450,7 @@ static u32 sub_80285AC(struct Sprite *sprite) u8 mod = (++sprite->data[1] / 13) % 4; if (sprite->data[1] % 13 == 0 && mod != 0) - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); if (sprite->data[1] >= 104) { sprite->data[0] = 0; @@ -3567,7 +3567,7 @@ static bool32 sub_8028828(void) continue; gUnknown_02022CF4->unkC[i] = 1; gUnknown_02022CF4->unk16[i] = -16; - PlaySE(SE_TK_KASYA); + PlaySE(SE_CLICK); } sprite->pos1.y += gUnknown_02022CF4->unk16[i]; } @@ -4266,7 +4266,7 @@ static void sub_802988C(void) gUnknown_02022CF8->state++; break; case 4: - if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON) + if (++gUnknown_02022CF8->unk301C >= 30 && JOY_NEW(A_BUTTON)) { gUnknown_02022CF8->unk301C = 0; PlaySE(SE_SELECT); @@ -4298,7 +4298,7 @@ static void sub_802988C(void) gUnknown_02022CF8->state++; break; case 8: - if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON) + if (++gUnknown_02022CF8->unk301C >= 30 && JOY_NEW(A_BUTTON)) { gUnknown_02022CF8->unk301C = 0; PlaySE(SE_SELECT); @@ -4320,7 +4320,7 @@ static void sub_802988C(void) } break; case 9: - PlayNewMapMusic(MUS_FANFA1); + PlayNewMapMusic(MUS_LEVEL_UP); FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1)); strWidth = GetStringWidth(1, gText_AnnouncingPrizes, -1); @@ -4354,11 +4354,11 @@ static void sub_802988C(void) PutWindowTilemap(gUnknown_02022CF8->unk3008[1]); } CopyBgTilemapBufferToVram(0); - FadeOutAndFadeInNewMapMusic(MUS_RG_WIN_YASEI, 20, 10); + FadeOutAndFadeInNewMapMusic(MUS_RG_VICTORY_WILD, 20, 10); gUnknown_02022CF8->state++; break; case 11: - if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON) + if (++gUnknown_02022CF8->unk301C >= 30 && JOY_NEW(A_BUTTON)) { gUnknown_02022CF8->unk301C = 0; PlaySE(SE_SELECT); @@ -4424,14 +4424,14 @@ static void sub_802A010(void) AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_SelectorArrow2, 0, ((y - 1) * 16) + 1, -1, NULL); CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 3); // Increment state only if A or B button have been pressed. - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (gUnknown_02022CF8->unk3020 == 0) gUnknown_02022CF8->unk3020 = 1; gUnknown_02022CF8->state++; } - else if (gMain.newKeys & (DPAD_UP | DPAD_DOWN)) + else if (JOY_NEW(DPAD_UP | DPAD_DOWN)) { PlaySE(SE_SELECT); switch (gUnknown_02022CF8->unk3020) @@ -4447,7 +4447,7 @@ static void sub_802A010(void) break; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gUnknown_02022CF8->unk3020 = 2; diff --git a/src/easy_chat.c b/src/easy_chat.c index c839c0070d..e08f0bb75c 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1523,7 +1523,7 @@ static u16 sub_811AB68(void) { do { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { sub_811BF78(); sEasyChatScreen->state = 2; @@ -1532,30 +1532,30 @@ static u16 sub_811AB68(void) sEasyChatScreen->unk_0c = 0; return 9; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return sub_811B150(); } - else if (gMain.newKeys & START_BUTTON) + else if (JOY_NEW(START_BUTTON)) { return sub_811B1B4(); } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { sEasyChatScreen->mainCursorRow--; break; } - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) { sEasyChatScreen->mainCursorColumn--; break; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { sEasyChatScreen->mainCursorRow++; break; } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { sEasyChatScreen->mainCursorColumn++; break; @@ -1595,7 +1595,7 @@ static u16 sub_811ACDC(void) { do { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sEasyChatScreen->mainCursorColumn) { @@ -1610,30 +1610,30 @@ static u16 sub_811ACDC(void) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { return sub_811B150(); } - else if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) { return sub_811B1B4(); } - else if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { sEasyChatScreen->mainCursorRow--; break; } - else if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { sEasyChatScreen->mainCursorColumn--; break; } - else if (gMain.newKeys & DPAD_DOWN) + if (JOY_NEW(DPAD_DOWN)) { sEasyChatScreen->mainCursorRow = 0; break; } - else if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) { sEasyChatScreen->mainCursorColumn++; break; @@ -1666,10 +1666,10 @@ static u16 sub_811ACDC(void) static u16 sub_811AE44(void) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return sub_811B32C(); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (sEasyChatScreen->unk_0a != -1) return sub_811B2B0(); @@ -1685,19 +1685,19 @@ static u16 sub_811AE44(void) } } - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) return sub_811B33C(); - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return sub_811B528(2); - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return sub_811B528(3); - if (gMain.newAndRepeatedKeys & DPAD_LEFT) + if (JOY_REPEAT(DPAD_LEFT)) return sub_811B528(1); - if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + if (JOY_REPEAT(DPAD_RIGHT)) return sub_811B528(0); return 0; @@ -1705,31 +1705,31 @@ static u16 sub_811AE44(void) static u16 sub_811AF00(void) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { sEasyChatScreen->state = 2; return 14; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) return sub_811B394(); - if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) return sub_811B794(4); - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) return sub_811B794(5); - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return sub_811B794(2); - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return sub_811B794(3); - if (gMain.newAndRepeatedKeys & DPAD_LEFT) + if (JOY_REPEAT(DPAD_LEFT)) return sub_811B794(1); - if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + if (JOY_REPEAT(DPAD_RIGHT)) return sub_811B794(0); return 0; @@ -1794,10 +1794,10 @@ static u16 sub_811B040(void) static u16 sub_811B08C(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) return 26; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return sub_811B150(); return 0; @@ -1805,7 +1805,7 @@ static u16 sub_811B08C(void) static u16 sub_811B0BC(void) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { sEasyChatScreen->state = sub_811B2A4(); return 7; @@ -2023,7 +2023,7 @@ static int sub_811B368(void) { if (sEasyChatScreen->type == EASY_CHAT_TYPE_BARD_SONG) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return 0; } else @@ -2038,7 +2038,7 @@ static int sub_811B394(void) u16 easyChatWord = sub_811F578(sub_811B940()); if (sub_811BF88(easyChatWord)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return 0; } else diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 3ccc7ebf84..87f0a13fd5 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -578,10 +578,10 @@ static void Task_EggHatchPlayBGM(u8 taskID) PlayRainStoppingSoundEffect(); } if (gTasks[taskID].data[0] == 1) - PlayBGM(MUS_ME_SHINKA); + PlayBGM(MUS_EVOLUTION_INTRO); if (gTasks[taskID].data[0] > 60) { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); DestroyTask(taskID); // UB: task is destroyed, yet the value is incremented } @@ -637,7 +637,7 @@ static void CB2_EggHatch_1(void) GetMonNickname2(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_HatchedFromEgg); EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 3, 0xFF); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); sEggHatchData->CB2_state++; PutWindowTilemap(sEggHatchData->windowId); CopyWindowToVram(sEggHatchData->windowId, 3); @@ -716,7 +716,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 1); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 1); CreateRandomEggShardSprite(); } @@ -739,7 +739,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); } } @@ -766,13 +766,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); CreateRandomEggShardSprite(); CreateRandomEggShardSprite(); } if (sprite->data[0] == 30) - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -799,7 +799,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_TAMAGO); + PlaySE(SE_EGG_HATCH); sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; diff --git a/src/ereader_screen.c b/src/ereader_screen.c index 823e03dd44..3f2cf3217f 100755 --- a/src/ereader_screen.c +++ b/src/ereader_screen.c @@ -137,7 +137,7 @@ static u32 sub_81D4EE4(u8 *arg0, u16 *arg1) { *arg0 = 1; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { *arg0 = 0; return 1; @@ -153,12 +153,12 @@ static u32 sub_81D4EE4(u8 *arg0, u16 *arg1) case 2: if (GetLinkPlayerCount_2() == 2) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); CheckShouldAdvanceLinkState(); *arg1 = 0; *arg0 = 3; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { *arg0 = 0; return 1; @@ -288,7 +288,7 @@ static void sub_81D5084(u8 taskId) OpenEReaderLink(); data->unk8 = 6; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { sub_81D505C(&data->unk0); PlaySE(SE_SELECT); @@ -296,7 +296,7 @@ static void sub_81D5084(u8 taskId) } break; case 6: - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); CloseLink(); @@ -431,12 +431,12 @@ static void sub_81D5084(u8 taskId) if (sub_81D5064(&data->unk0, 120)) { AddTextPrinterToWindow1(gJPText_NewTrainerHasComeToHoenn); - PlayFanfare(MUS_FANFA4); + PlayFanfare(MUS_OBTAIN_ITEM); data->unk8 = 19; } break; case 19: - if (IsFanfareTaskInactive() && (gMain.newKeys & (A_BUTTON | B_BUTTON))) + if (IsFanfareTaskInactive() && (JOY_NEW(A_BUTTON | B_BUTTON))) data->unk8 = 26; break; case 23: diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a076a2a222..72de880c85 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -8216,15 +8216,13 @@ bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) { return TRUE; } - else - { - objectEvent->frozen = 1; - objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; - objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; - gSprites[objectEvent->spriteId].animPaused = 1; - gSprites[objectEvent->spriteId].affineAnimPaused = 1; - return FALSE; - } + + objectEvent->frozen = 1; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; + gSprites[objectEvent->spriteId].animPaused = 1; + gSprites[objectEvent->spriteId].affineAnimPaused = 1; + return FALSE; } void FreezeObjectEvents(void) @@ -8397,8 +8395,8 @@ bool8 sub_80976EC(struct Sprite *sprite) if (sprite->data[5] > 15) return TRUE; - else - return FALSE; + + return FALSE; } static const s8 sFigure8XOffsets[FIGURE_8_LENGTH] = { @@ -8478,15 +8476,15 @@ static bool8 AnimateSpriteInFigure8(struct Sprite *sprite) return finished; } -static const s8 gUnknown_0850E802[] = { +static const s8 gUnknown_0850E802[16] = { -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0 }; -static const s8 gUnknown_0850E812[] = { +static const s8 gUnknown_0850E812[16] = { 0, -2, -3, -4, -5, -6, -6, -6, -5, -5, -4, -3, -2, 0, 0, 0 }; -static const s8 gUnknown_0850E822[] = { +static const s8 gUnknown_0850E822[16] = { -2, -4, -6, -8, -9, -10, -10, -10, -9, -8, -6, -5, -3, -2, 0, 0 }; @@ -8509,23 +8507,11 @@ void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4) sprite->data[6] = 0; } -static const s16 gUnknown_0850E840[] = { - 16, 16, 32, -}; - -static const u8 gUnknown_0850E846[] = { - 0, 0, 1, -}; - u8 sub_809785C(struct Sprite *sprite) { - s16 v5[3]; - u8 v6[3]; - u8 v2; - - memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy - memcpy(v6, gUnknown_0850E846, 3); - v2 = 0; + s16 v5[] = {16, 16, 32}; + u8 v6[] = {0, 0, 1}; + u8 v2 = 0; if (sprite->data[4]) Step1(sprite, sprite->data[3]); @@ -8546,23 +8532,11 @@ u8 sub_809785C(struct Sprite *sprite) return v2; } -static const s16 gUnknown_0850E84A[] = { - 32, 32, 64, -}; - -static const u8 gUnknown_0850E850[] = { - 1, 1, 2, -}; - u8 sub_80978E4(struct Sprite *sprite) { - s16 v5[3]; - u8 v6[3]; - u8 v2; - - memcpy(v5, gUnknown_0850E84A, 6); - memcpy(v6, gUnknown_0850E850, 3); - v2 = 0; + s16 v5[] = {32, 32, 64}; + u8 v6[] = {1, 1, 2}; + u8 v2 = 0; if (sprite->data[4] && !(sprite->data[6] & 1)) Step1(sprite, sprite->data[3]); @@ -8590,12 +8564,9 @@ static void SetMovementDelay(struct Sprite *sprite, s16 timer) static bool8 WaitForMovementDelay(struct Sprite *sprite) { - sprite->data[3]--; - - if (sprite->data[3] == 0) + if (--sprite->data[3] == 0) return TRUE; - else - return FALSE; + return FALSE; } void SetAndStartSpriteAnim(struct Sprite *sprite, u8 animNum, u8 animCmdIndex) @@ -8609,8 +8580,7 @@ bool8 SpriteAnimEnded(struct Sprite *sprite) { if (sprite->animEnded) return TRUE; - else - return FALSE; + return FALSE; } void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) @@ -8789,14 +8759,14 @@ static void UpdateObjectEventSpritePosition(struct Sprite *sprite) { switch(sprite->tAnimNum) { + case 0: + break; case UNION_ROOM_SPAWN_IN: MoveUnionRoomObjectDown(sprite); break; case UNION_ROOM_SPAWN_OUT: MoveUnionRoomObjectUp(sprite); break; - case 0: - break; default: sprite->tAnimNum = 0; break; @@ -8877,8 +8847,7 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct } else { - u8 i; - u8 firstFreeSlot; + u8 i, firstFreeSlot; bool32 found; for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) { diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 849c676b35..28bbd4ef79 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -271,7 +271,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID) gTasks[taskID].tFrameCounter = 0; BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, RGB_WHITE); gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1; - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); } static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID) @@ -311,7 +311,7 @@ static void EvoTask_BeginPreSparklesSet2(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2; - PlaySE(SE_W062B); + PlaySE(SE_M_BUBBLE_BEAM2); } static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID) @@ -345,7 +345,7 @@ static void EvoTask_BeginPostSparklesSet1(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1; - PlaySE(SE_REAPOKE); + PlaySE(SE_SHINY); } static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID) @@ -389,7 +389,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID) @@ -437,7 +437,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 019d48416c..61065367cc 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -630,14 +630,14 @@ static void Task_EvolutionScene(u8 taskID) case 3: if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID)) // wait for animation, play tu du SE { - PlaySE(MUS_ME_SHINKA); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskID].tState++; } break; case 4: // play evolution music and fade screen black if (!IsSEPlaying()) { - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } @@ -713,7 +713,7 @@ static void Task_EvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); BattlePutTextOnWindow(gStringVar4, 0); - PlayBGM(MUS_FANFA5); + PlayBGM(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -808,7 +808,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter @@ -859,21 +859,21 @@ static void Task_EvolutionScene(u8 taskID) } break; case 4: - if (gMain.newKeys & DPAD_UP && sEvoCursorPos != 0) + if (JOY_NEW(DPAD_UP) && sEvoCursorPos != 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(sEvoCursorPos); sEvoCursorPos = 0; BattleCreateYesNoCursorAt(0); } - if (gMain.newKeys & DPAD_DOWN && sEvoCursorPos == 0) + if (JOY_NEW(DPAD_DOWN) && sEvoCursorPos == 0) { PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(sEvoCursorPos); sEvoCursorPos = 1; BattleCreateYesNoCursorAt(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); @@ -889,7 +889,7 @@ static void Task_EvolutionScene(u8 taskID) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); @@ -998,15 +998,15 @@ static void Task_TradeEvolutionScene(u8 taskID) case 2: if (IsCryFinished()) { - m4aSongNumStop(MUS_SHINKA); - PlaySE(MUS_ME_SHINKA); + m4aSongNumStop(MUS_EVOLUTION); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskID].tState++; } break; case 3: if (!IsSEPlaying()) { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } @@ -1076,7 +1076,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); DrawTextOnTradeWindow(0, gStringVar4, 1); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -1109,7 +1109,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } else { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1); gTasks[taskID].tState++; } @@ -1153,7 +1153,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 3684b53e6d..fab14c5776 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -946,7 +946,7 @@ bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); DoDiveWarp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } @@ -956,7 +956,7 @@ bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); DoDiveWarp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } diff --git a/src/field_door.c b/src/field_door.c index e81c3dc4b7..4dcb07ccae 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -526,9 +526,9 @@ u32 GetDoorSoundEffect(u32 x, u32 y) if (sound == DOOR_SOUND_NORMAL) return SE_DOOR; else if (sound == DOOR_SOUND_SLIDING) - return SE_JIDO_DOA; + return SE_SLIDING_DOOR; else if (sound == DOOR_SOUND_ARENA) - return SE_TU_SAA; + return SE_REPEL; else return SE_DOOR; } diff --git a/src/field_effect.c b/src/field_effect.c index 582551a7ea..b64902c0ec 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1141,7 +1141,7 @@ static void PokeballGlowEffect_PlaceBalls(struct Sprite *sprite) gSprites[spriteId].sEffectSpriteId = sprite->sSpriteId; sprite->sCounter++; sprite->sNumMons--; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } if (sprite->sNumMons == 0) { @@ -1160,7 +1160,7 @@ static void PokeballGlowEffect_TryPlaySe(struct Sprite *sprite) sprite->data[3] = 0; if (sprite->sPlayHealSe) { - PlayFanfare(MUS_ME_ASA); + PlayFanfare(MUS_HEAL); } } } @@ -1464,7 +1464,7 @@ static bool8 FallWarpEffect_StartFall(struct Task *task) task->tFallOffset = 1; task->tTotalFall = 0; gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); task->tState++; return FALSE; } @@ -1493,7 +1493,7 @@ static bool8 FallWarpEffect_Fall(struct Task *task) } if (sprite->pos2.y >= 0) { - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); objectEvent->triggerGroundEffectsOnStop = 1; objectEvent->landingJump = 1; sprite->pos2.y = 0; @@ -1589,7 +1589,7 @@ static bool8 EscalatorWarpOut_WaitForPlayer(struct Task *task) { task->tState = 4; // jump to EscalatorWarpOut_Down_Ride } - PlaySE(SE_ESUKA); + PlaySE(SE_ESCALATOR); } return FALSE; } @@ -1978,7 +1978,7 @@ static bool8 LavaridgeGymB1FWarpEffect_Launch(struct Task *task, struct ObjectEv gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_ASH_LAUNCH); - PlaySE(SE_W153); + PlaySE(SE_M_EXPLOSION); task->data[0]++; return TRUE; } @@ -2092,7 +2092,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_PopOut(struct Task *task, struct Obje task->data[0]++; objectEvent->invisible = FALSE; CameraObjectReset1(); - PlaySE(SE_W091); + PlaySE(SE_M_DIG); ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; @@ -2163,7 +2163,7 @@ static bool8 LavaridgeGym1FWarpEffect_AshPuff(struct Task *task, struct ObjectEv { task->data[1]++; ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_LAVARIDGE_FALL_WARP); } } return FALSE; @@ -2381,7 +2381,7 @@ static void TeleportWarpOutFieldEffect_SpinGround(struct Task *task) task->data[1] = 4; task->data[2] = 8; task->data[3] = 1; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2472,7 +2472,7 @@ static void TeleportWarpInFieldEffect_Init(struct Task *task) task->data[2] = 1; task->data[14] = sprite->subspriteMode; task->data[15] = GetPlayerFacingDirection(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2974,7 +2974,7 @@ u8 FldEff_UseSurf(void) u8 taskId = CreateTask(Task_SurfFieldEffect, 0xff); gTasks[taskId].tMonId = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - Overworld_ChangeMusicTo(MUS_NAMINORI); + Overworld_ChangeMusicTo(MUS_SURF); return FALSE; } @@ -3111,7 +3111,7 @@ u8 FldEff_NPCFlyOut(void) sprite->oam.priority = 1; sprite->callback = SpriteCB_NPCFlyOut; sprite->data[1] = gFieldEffectArguments[0]; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); return spriteId; } @@ -3228,7 +3228,7 @@ static void FlyOutFieldEffect_BirdSwoopDown(struct Task *task) if ((task->tTimer == 0 || (--task->tTimer) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->tState++; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); StartFlyBirdSwoopDown(task->tBirdSpriteId); } } @@ -3692,7 +3692,7 @@ static void Task_DestroyDeoxysRock(u8 taskId) static void DestroyDeoxysRockEffect_CameraShake(s16* data, u8 taskId) { u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90); - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); tCameraTaskId = newTaskId; tState++; } @@ -3706,7 +3706,7 @@ static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId) BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); CreateDeoxysRockFragments(sprite); - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); StartEndingDeoxysRockCameraShake(tCameraTaskId); tTimer = 0; tState++; diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 6929485c47..886e023d1c 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -623,7 +623,7 @@ u32 FldEff_Splash(void) sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; sprite->pos2.y = (graphicsInfo->height >> 1) - 4; - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } return 0; } @@ -733,7 +733,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6ad92c2fb2..e907af5b9e 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1021,7 +1021,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); PlayerSetAnimId(GetJump2MovementAction(direction), 8); } @@ -1055,28 +1055,28 @@ void PlayerEndWheelie(u8 direction) // wheelie hopping standing void PlayerStandingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1); } // wheelie hopping moving void PlayerMovingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2); } // wheelie hopping ledge void PlayerLedgeHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8); } // acro turn jump void PlayerAcroTurnJump(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } @@ -1501,7 +1501,7 @@ static bool8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObjec gFieldEffectArguments[2] = strengthObject->previousElevation; gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority; FieldEffectStart(FLDEFF_DUST); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); task->data[0]++; } return FALSE; @@ -1540,7 +1540,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent gPlayerAvatar.preventStep = TRUE; if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) @@ -1574,7 +1574,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); return TRUE; } @@ -1789,7 +1789,7 @@ static bool8 Fishing_ShowDots(struct Task *task) AlignFishingAnimationFrames(); task->tFrameCounter++; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { task->tStep = FISHING_NO_BITE; if (task->tRoundsPlayed != 0) @@ -1878,7 +1878,7 @@ static bool8 Fishing_WaitForA(struct Task *task) task->tFrameCounter++; if (task->tFrameCounter >= reelTimeouts[task->tFishingRod]) task->tStep = FISHING_GOT_AWAY; - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) task->tStep++; return FALSE; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 92ee8cad31..9becd21666 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -299,7 +299,7 @@ static void FieldCB_TeleportTileWarpExit(void) { Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(Task_TeleportTileWarpExit, 10); ScriptContext2_Enable(); } @@ -308,7 +308,7 @@ static void FieldCB_MossdeepGymWarpExit(void) { Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(Task_ExitNonDoor, 10); ScriptContext2_Enable(); SetObjectEventLoadFlag((~SKIP_OBJECT_EVENT_LOAD) & 0xF); @@ -487,7 +487,7 @@ void DoWarp(void) TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_DefaultWarpExit; CreateTask(Task_WarpAndLoadMap, 10); } @@ -549,7 +549,7 @@ void DoTeleportTileWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(Task_WarpAndLoadMap, 10); gFieldCallback = FieldCB_TeleportTileWarpExit; } @@ -561,7 +561,7 @@ void DoMossdeepGymWarp(void) SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(Task_WarpAndLoadMap, 10); gFieldCallback = FieldCB_MossdeepGymWarpExit; } @@ -605,7 +605,7 @@ void DoCableClubWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); CreateTask(Task_DoCableClubWarp, 10); } @@ -619,7 +619,7 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId) ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; break; case 1: @@ -760,7 +760,7 @@ void DoContestHallWarp(void) TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_WarpExitFadeFromBlack; CreateTask(Task_DoContestHallWarp, 10); } @@ -1028,7 +1028,7 @@ static void sub_80B01BC(u8 taskId) case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); sub_808D1C8(); task->data[0]++; break; diff --git a/src/field_special_scene.c b/src/field_special_scene.c index bb8e8b1d92..6b41c54237 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -171,7 +171,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1] = 0; // reset the timer. data[2] = CreateTask(Task_Truck1, 0xA); data[0] = 1; // run the next case. - PlaySE(SE_TRACK_MOVE); + PlaySE(SE_TRUCK_MOVE); } break; case 1: @@ -191,7 +191,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySE(SE_TRACK_STOP); + PlaySE(SE_TRUCK_STOP); } break; case 3: @@ -206,7 +206,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySE(SE_TRACK_HAIKI); + PlaySE(SE_TRUCK_UNLOAD); data[1] = 0; data[0] = 5; } @@ -219,7 +219,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, METATILE_InsideOfTruck_ExitLight_Mid); MapGridSetMetatileIdAt(11, 10, METATILE_InsideOfTruck_ExitLight_Bottom); DrawWholeMapView(); - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } @@ -280,7 +280,7 @@ void Task_HandlePorthole(u8 taskId) } break; case IDLE_CHECK: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) data[1] = 1; if (!ScriptMovement_IsObjectMovementFinished(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup)) return; diff --git a/src/field_specials.c b/src/field_specials.c index 7c6ef37d7b..57b7501454 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -827,7 +827,7 @@ void PetalburgGymSlideOpenRoomDoors(void) { sSlidingDoorNextFrameCounter = 0; sSlidingDoorFrame = 0; - PlaySE(SE_KI_GASYAN); + PlaySE(SE_UNLOCK); CreateTask(Task_PetalburgGymSlideOpenRoomDoors, 8); } @@ -1509,7 +1509,7 @@ void ShakeCamera(void) gTasks[taskId].delay = gSpecialVar_0x8007; gTasks[taskId].verticalPan = gSpecialVar_0x8004; SetCameraPanningCallback(NULL); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); } static void Task_ShakeCamera(u8 taskId) @@ -1880,7 +1880,7 @@ void MoveElevator(void) SetCameraPanningCallback(NULL); MoveElevatorWindowLights(floorDelta, data[6]); - PlaySE(SE_ELEBETA); + PlaySE(SE_ELEVATOR); } static void Task_MoveElevator(u8 taskId) @@ -1897,7 +1897,7 @@ static void Task_MoveElevator(u8 taskId) // arrived at floor if (data[2] == data[5]) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); DestroyTask(taskId); EnableBothScriptContexts(); InstallCameraPanAheadCallback(); @@ -3438,9 +3438,9 @@ static void ChangeDeoxysRockLevel(u8 rockLevel) TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); else - PlaySE(SE_RG_DEOMOV); + PlaySE(SE_RG_DEOXYS_MOVE); CreateTask(WaitForDeoxysRockMovement, 8); gFieldEffectArguments[0] = 1; @@ -3649,14 +3649,14 @@ bool8 AbnormalWeatherHasExpired(void) } } - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER3)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_ROUTE127)) { switch (gSaveBlock1Ptr->location.mapNum) { - case MAP_NUM(UNDERWATER3): - case MAP_NUM(UNDERWATER5): - case MAP_NUM(UNDERWATER6): - case MAP_NUM(UNDERWATER7): + case MAP_NUM(UNDERWATER_ROUTE127): + case MAP_NUM(UNDERWATER_ROUTE129): + case MAP_NUM(UNDERWATER_ROUTE105): + case MAP_NUM(UNDERWATER_ROUTE125): VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1); return FALSE; default: @@ -3888,12 +3888,14 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId) void Script_DoRayquazaScene(void) { - if (gSpecialVar_0x8004 == 0) + if (!gSpecialVar_0x8004) { + // Groudon/Kyogre fight scene DoRayquazaScene(0, TRUE, CB2_ReturnToFieldContinueScriptPlayMapMusic); } else { + // Rayquaza arrives scene DoRayquazaScene(1, FALSE, CB2_ReturnToFieldContinueScriptPlayMapMusic); } } @@ -3904,7 +3906,7 @@ void Script_DoRayquazaScene(void) void LoopWingFlapSE(void) { CreateTask(Task_LoopWingFlapSE, 8); - PlaySE(SE_W017); + PlaySE(SE_M_WING_ATTACK); } static void Task_LoopWingFlapSE(u8 taskId) @@ -3916,7 +3918,7 @@ static void Task_LoopWingFlapSE(u8 taskId) { playCount++; delay = 0; - PlaySE(SE_W017); + PlaySE(SE_M_WING_ATTACK); } if (playCount == gSpecialVar_0x8004 - 1) diff --git a/src/field_tasks.c b/src/field_tasks.c index 49b6fbdd8c..002977a105 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -219,13 +219,13 @@ static void DummyPerStepCallback(u8 taskId) static const struct PacifidlogMetatileOffsets *GetPacifidlogBridgeMetatileOffsets(const struct PacifidlogMetatileOffsets *offsets, u16 metatileBehavior) { - if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior)) + if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior)) return &offsets[0 * 2]; - else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior)) return &offsets[1 * 2]; - else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior)) return &offsets[2 * 2]; - else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior)) return &offsets[3 * 2]; else return NULL; @@ -265,22 +265,22 @@ static bool32 StandingOnNewPacifidlogBridge(s16 x1, s16 y1, s16 x2, s16 y2) { u16 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2); - if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior)) + if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior)) { if (y1 > y2) return FALSE; } - else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior)) { if (y1 < y2) return FALSE; } - else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior)) { if (x1 > x2) return FALSE; } - else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior)) { if (x1 < x2) return FALSE; @@ -292,22 +292,22 @@ static bool32 StandingOnSamePacifidlogBridge(s16 x1, s16 y1, s16 x2, s16 y2) { u16 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1); - if (MetatileBehavior_IsPacifilogVerticalLog1(metatileBehavior)) + if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior)) { if (y1 < y2) return FALSE; } - else if (MetatileBehavior_IsPacifilogVerticalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior)) { if (y1 > y2) return FALSE; } - else if (MetatileBehavior_IsPacifilogHorizontalLog1(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior)) { if (x1 < x2) return FALSE; } - else if (MetatileBehavior_IsPacifilogHorizontalLog2(metatileBehavior)) + else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior)) { if (x1 > x2) return FALSE; @@ -357,7 +357,7 @@ static void PacifidlogBridgePerStepCallback(u8 taskId) data[2] = x; data[3] = y; if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y))) - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } break; case 2: @@ -443,7 +443,7 @@ static void FortreeBridgePerStepCallback(u8 taskId) flag = 1; if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1)) - PlaySE(SE_HASHI); + PlaySE(SE_BRIDGE_WALK); if (isFortreeBridgePrev) { @@ -583,7 +583,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_BARI); + PlaySE(SE_ICE_CRACK); MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Cracked); CurrentMapDrawMetatileAt(x, y); MarkIcePuzzleCoordVisited(x - 7, y - 7); @@ -599,7 +599,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_GASYAN); + PlaySE(SE_ICE_BREAK); MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Broken); CurrentMapDrawMetatileAt(x, y); data[1] = 1; diff --git a/src/field_weather.c b/src/field_weather.c index 684a86479a..25ee0582a2 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1038,13 +1038,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect) { switch (soundEffect) { - case SE_T_KOAME: + case SE_RAIN: gWeatherPtr->rainStrength = 0; break; - case SE_T_OOAME: + case SE_DOWNPOUR: gWeatherPtr->rainStrength = 1; break; - case SE_T_AME: + case SE_THUNDERSTORM: gWeatherPtr->rainStrength = 2; break; default: @@ -1062,14 +1062,14 @@ void PlayRainStoppingSoundEffect(void) switch (gWeatherPtr->rainStrength) { case 0: - PlaySE(SE_T_KOAME_E); + PlaySE(SE_RAIN_STOP); break; case 1: - PlaySE(SE_T_OOAME_E); + PlaySE(SE_DOWNPOUR_STOP); break; case 2: default: - PlaySE(SE_T_AME_E); + PlaySE(SE_THUNDERSTORM_STOP); break; } } diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 26a7adf27c..320a106701 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -479,7 +479,7 @@ void Rain_InitVars(void) gWeatherPtr->targetRainSpriteCount = 10; gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; - SetRainStrengthFromSoundEffect(SE_T_KOAME); + SetRainStrengthFromSoundEffect(SE_RAIN); } void Rain_InitAll(void) @@ -1023,7 +1023,7 @@ void Thunderstorm_InitVars(void) gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment gWeatherPtr->thunderTriggered = 0; - SetRainStrengthFromSoundEffect(SE_T_AME); + SetRainStrengthFromSoundEffect(SE_THUNDERSTORM); } void Thunderstorm_InitAll(void) @@ -1051,7 +1051,7 @@ void Downpour_InitVars(void) gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment - SetRainStrengthFromSoundEffect(SE_T_OOAME); + SetRainStrengthFromSoundEffect(SE_DOWNPOUR); } void Downpour_InitAll(void) @@ -1220,9 +1220,9 @@ static void UpdateThunderSound(void) return; if (Random() & 1) - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); else - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); gWeatherPtr->thunderTriggered = 0; } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 939c15dbf0..9916177131 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -311,7 +311,7 @@ bool8 FldEff_CutGrass(void) s16 x, y; u8 i = 0; - PlaySE(SE_W015); + PlaySE(SE_M_CUT); PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); for (i = 0; i < CUT_HYPER_AREA; i++) { @@ -634,7 +634,7 @@ void FixLongGrassMetatilesWindowBottom(s16 x, s16 y) static void StartCutTreeFieldEffect(void) { - PlaySE(SE_W015); + PlaySE(SE_M_CUT); FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); EnableBothScriptContexts(); } diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 2d25928b8a..b2ddf31801 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -104,7 +104,7 @@ static void FieldCallback_Flash(void) static void FldEff_UseFlash(void) { - PlaySE(SE_W115); + PlaySE(SE_M_REFLECT); FlagSet(FLAG_SYS_USE_FLASH); ScriptContext1_SetupScript(EventScript_UseFlash); } diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 6db44d7520..7eae8cfd12 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -618,7 +618,7 @@ bool8 FldEff_SecretPowerCave(void) static void SpriteCB_CaveEntranceInit(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); sprite->data[0] = 0; sprite->callback = SpriteCB_CaveEntranceOpen; @@ -691,7 +691,7 @@ bool8 FldEff_SecretPowerTree(void) static void SpriteCB_TreeEntranceInit(struct Sprite *sprite) { - PlaySE(SE_W010); + PlaySE(SE_M_SCRATCH); sprite->animNum = gFieldEffectArguments[7]; sprite->data[0] = 0; @@ -754,7 +754,7 @@ bool8 FldEff_SecretPowerShrub(void) static void SpriteCB_ShrubEntranceInit(struct Sprite *sprite) { - PlaySE(SE_W077); + PlaySE(SE_M_POISON_POWDER); sprite->data[0] = 0; sprite->callback = SpriteCB_ShrubEntranceOpen; @@ -888,16 +888,16 @@ static void DoBalloonSoundEffect(s16 metatileId) switch (metatileId) { case METATILE_SecretBase_RedBalloon: - PlaySE(SE_FUUSEN1); + PlaySE(SE_BALLOON_RED); break; case METATILE_SecretBase_BlueBalloon: - PlaySE(SE_FUUSEN2); + PlaySE(SE_BALLOON_BLUE); break; case METATILE_SecretBase_YellowBalloon: - PlaySE(SE_FUUSEN3); + PlaySE(SE_BALLOON_YELLOW); break; case METATILE_SecretBase_MudBall: - PlaySE(SE_TOY_DANGO); + PlaySE(SE_MUD_BALL); break; } } @@ -914,7 +914,7 @@ bool8 FldEff_Nop48(void) static void DoSecretBaseBreakableDoorEffect(s16 x, s16 y) { - PlaySE(SE_TOY_KABE); + PlaySE(SE_BREAKABLE_DOOR); MapGridSetMetatileIdAt(x, y, METATILE_SecretBase_BreakableDoor_BottomOpen); MapGridSetMetatileIdAt(x, y - 1, METATILE_SecretBase_BreakableDoor_TopOpen); CurrentMapDrawMetatileAt(x, y); @@ -959,28 +959,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) switch (gTasks[taskId].tMetatileID) { case METATILE_SecretBase_NoteMat_C_Low: - PlaySE(SE_TOY_C); + PlaySE(SE_NOTE_C); break; case METATILE_SecretBase_NoteMat_D: - PlaySE(SE_TOY_D); + PlaySE(SE_NOTE_D); break; case METATILE_SecretBase_NoteMat_E: - PlaySE(SE_TOY_E); + PlaySE(SE_NOTE_E); break; case METATILE_SecretBase_NoteMat_F: - PlaySE(SE_TOY_F); + PlaySE(SE_NOTE_F); break; case METATILE_SecretBase_NoteMat_G: - PlaySE(SE_TOY_G); + PlaySE(SE_NOTE_G); break; case METATILE_SecretBase_NoteMat_A: - PlaySE(SE_TOY_A); + PlaySE(SE_NOTE_A); break; case METATILE_SecretBase_NoteMat_B: - PlaySE(SE_TOY_B); + PlaySE(SE_NOTE_B); break; case METATILE_SecretBase_NoteMat_C_High: - PlaySE(SE_TOY_C1); + PlaySE(SE_NOTE_C_HIGH); break; } @@ -1006,7 +1006,7 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) sprite->data[0]++; if (sprite->data[0] == 8) - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); if (sprite->data[0] >= 32) DestroySprite(sprite); @@ -1081,7 +1081,7 @@ bool8 FldEff_SandPillar(void) static void SpriteCB_SandPillar_BreakTop(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == METATILE_SecretBase_SandOrnament_TopWall) MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, METATILE_SecretBase_Wall_TopMid | METATILE_COLLISION_MASK); @@ -1226,7 +1226,7 @@ static void Task_FieldPoisonEffect(u8 taskId) void FldEffPoison_Start(void) { - PlaySE(SE_DOKU); + PlaySE(SE_FIELD_POISON); CreateTask(Task_FieldPoisonEffect, 80); } diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 0c35ec74ed..6f4ce8002b 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -162,7 +162,7 @@ bool8 FldEff_UseRockSmash(void) // The actual rock smashing is handled by EventScript_SmashRock, so this function does very little static void FieldMove_RockSmash(void) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); EnableBothScriptContexts(); } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index bfa20cdbcb..3a38f67f02 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -61,13 +61,13 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId) } // Take away Softboiled user's health first (-1) - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuModifyHP(taskId, userPartyId, -1, GetMonData(&gPlayerParty[userPartyId], MON_DATA_MAX_HP)/5, Task_SoftboiledRestoreHealth); } static void Task_SoftboiledRestoreHealth(u8 taskId) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP)/5, Task_DisplayHPRestoredMessage); } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 1ee82674e3..a9d81501f3 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -51,7 +51,7 @@ static void StartSweetScentFieldEffect(void) { u8 taskId; - PlaySE(SE_W230); + PlaySE(SE_M_SWEET_SCENT); CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100); CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB_RED); diff --git a/src/frontier_pass.c b/src/frontier_pass.c index adc02f90bb..1178cdbb44 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -871,10 +871,10 @@ static void CB2_ReturnFromRecord(void) switch (InBattlePyramid()) { case 1: - PlayBGM(MUS_PYRAMID); + PlayBGM(MUS_B_PYRAMID); break; case 2: - PlayBGM(MUS_PYRAMID_TOP); + PlayBGM(MUS_B_PYRAMID_TOP); break; default: Overworld_PlaySpecialMapMusic(); @@ -937,14 +937,14 @@ static void Task_HandleFrontierPassInput(u8 taskId) { u8 var = FALSE; // Reused, first informs whether the cursor moves, then used as the new cursor area. - if (gMain.heldKeys & DPAD_UP && sPassGfx->cursorSprite->pos1.y >= 9) + if (JOY_HELD(DPAD_UP) && sPassGfx->cursorSprite->pos1.y >= 9) { sPassGfx->cursorSprite->pos1.y -= 2; if (sPassGfx->cursorSprite->pos1.y <= 7) sPassGfx->cursorSprite->pos1.y = 2; var = TRUE; } - if (gMain.heldKeys & DPAD_DOWN && sPassGfx->cursorSprite->pos1.y <= 135) + if (JOY_HELD(DPAD_DOWN) && sPassGfx->cursorSprite->pos1.y <= 135) { sPassGfx->cursorSprite->pos1.y += 2; if (sPassGfx->cursorSprite->pos1.y >= 137) @@ -952,14 +952,14 @@ static void Task_HandleFrontierPassInput(u8 taskId) var = TRUE; } - if (gMain.heldKeys & DPAD_LEFT && sPassGfx->cursorSprite->pos1.x >= 6) + if (JOY_HELD(DPAD_LEFT) && sPassGfx->cursorSprite->pos1.x >= 6) { sPassGfx->cursorSprite->pos1.x -= 2; if (sPassGfx->cursorSprite->pos1.x <= 4) sPassGfx->cursorSprite->pos1.x = 5; var = TRUE; } - if (gMain.heldKeys & DPAD_RIGHT && sPassGfx->cursorSprite->pos1.x <= 231) + if (JOY_HELD(DPAD_RIGHT) && sPassGfx->cursorSprite->pos1.x <= 231) { sPassGfx->cursorSprite->pos1.x += 2; if (sPassGfx->cursorSprite->pos1.x >= 233) @@ -969,7 +969,7 @@ static void Task_HandleFrontierPassInput(u8 taskId) if (!var) // Cursor did not change. { - if (sPassData->cursorArea != CURSOR_AREA_NOTHING && gMain.newKeys & A_BUTTON) + if (sPassData->cursorArea != CURSOR_AREA_NOTHING && JOY_NEW(A_BUTTON)) { if (sPassData->cursorArea <= CURSOR_AREA_RECORD) // Map, Card, Record { @@ -986,7 +986,7 @@ static void Task_HandleFrontierPassInput(u8 taskId) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_PC_OFF); SetMainCallback2(CB2_HideFrontierPass); @@ -1471,19 +1471,19 @@ static void Task_HandleFrontierMap(u8 taskId) break; return; case 1: - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_PC_OFF); data[0] = 4; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (sMapData->cursorPos >= NUM_FRONTIER_FACILITIES - 1) HandleFrontierMapCursorMove(0); else data[0] = 2; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (sMapData->cursorPos == 0) HandleFrontierMapCursorMove(1); @@ -1707,5 +1707,5 @@ static void HandleFrontierMapCursorMove(u8 direction) CopyWindowToVram(i, 3); CopyBgTilemapBufferToVram(0); - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); } diff --git a/src/frontier_util.c b/src/frontier_util.c index c741a64fea..a36e2ec9f4 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -2486,7 +2486,6 @@ void SetFrontierBrainObjEventGfx_2(void) #define FRONTIER_BRAIN_OTID 61226 -#ifdef NONMATCHING void CreateFrontierBrainPokemon(void) { s32 i, j; @@ -2509,11 +2508,13 @@ void CreateFrontierBrainPokemon(void) { if (!(selectedMonBits & 1)) continue; - do { - j = Random32(); - } while (IsShinyOtIdPersonality(FRONTIER_BRAIN_OTID, j) || sFrontierBrainsMons[facility][symbol][i].nature != GetNatureFromPersonality(j)); + do + { + j = Random32(); //Should be one while loop, but that doesn't match + } while (IsShinyOtIdPersonality(FRONTIER_BRAIN_OTID, j)); + } while (sFrontierBrainsMons[facility][symbol][i].nature != GetNatureFromPersonality(j)); CreateMon(&gEnemyParty[monPartyId], sFrontierBrainsMons[facility][symbol][i].species, monLevel, @@ -2535,243 +2536,6 @@ void CreateFrontierBrainPokemon(void) monPartyId++; } } -#else -NAKED -void CreateFrontierBrainPokemon(void) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x44\n\ - ldr r0, =0x000040cf\n\ - bl VarGet\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - str r0, [sp, 0x20]\n\ - bl GetFronterBrainSymbol\n\ - str r0, [sp, 0x24]\n\ - ldr r0, [sp, 0x20]\n\ - cmp r0, 0x1\n\ - bne _081A4E44\n\ - ldr r0, =0x000003fe\n\ - bl TrainerIdToDomeTournamentId\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - bl GetDomeTrainerSelectedMons\n\ - adds r4, r0, 0\n\ - b _081A4E46\n\ - .pool\n\ -_081A4E44:\n\ - movs r4, 0x7\n\ -_081A4E46:\n\ - bl ZeroEnemyPartyMons\n\ - movs r1, 0\n\ - str r1, [sp, 0x18]\n\ - bl SetFacilityPtrsGetLevel\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x1C]\n\ - movs r2, 0\n\ - str r2, [sp, 0x14]\n\ -_081A4E5C:\n\ - movs r0, 0x1\n\ - ands r0, r4\n\ - asrs r4, 1\n\ - str r4, [sp, 0x30]\n\ - ldr r3, [sp, 0x14]\n\ - adds r3, 0x1\n\ - str r3, [sp, 0x28]\n\ - cmp r0, 0\n\ - bne _081A4E70\n\ - b _081A4FC4\n\ -_081A4E70:\n\ - ldr r4, [sp, 0x14]\n\ - lsls r4, 2\n\ - mov r9, r4\n\ - ldr r0, [sp, 0x24]\n\ - lsls r0, 4\n\ - str r0, [sp, 0x38]\n\ - ldr r1, [sp, 0x20]\n\ - lsls r1, 4\n\ - str r1, [sp, 0x34]\n\ - ldr r2, [sp, 0x1C]\n\ - lsls r2, 24\n\ - str r2, [sp, 0x3C]\n\ - ldr r3, [sp, 0x18]\n\ - adds r3, 0x1\n\ - str r3, [sp, 0x2C]\n\ - ldr r0, [sp, 0x14]\n\ - add r0, r9\n\ - lsls r0, 2\n\ - mov r8, r0\n\ -_081A4E96:\n\ - bl Random\n\ - adds r4, r0, 0\n\ - bl Random\n\ - lsls r4, 16\n\ - lsrs r7, r4, 16\n\ - lsls r0, 16\n\ - orrs r7, r0\n\ - ldr r0, =0x0000ef2a\n\ - adds r1, r7, 0\n\ - bl IsShinyOtIdPersonality\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _081A4E96\n\ - ldr r4, [sp, 0x38]\n\ - ldr r1, [sp, 0x24]\n\ - subs r0, r4, r1\n\ - lsls r5, r0, 2\n\ - mov r2, r8\n\ - adds r4, r2, r5\n\ - ldr r3, [sp, 0x34]\n\ - ldr r1, [sp, 0x20]\n\ - subs r0, r3, r1\n\ - lsls r6, r0, 3\n\ - adds r4, r6\n\ - ldr r2, =sFrontierBrainsMons\n\ - adds r4, r2\n\ - adds r0, r7, 0\n\ - bl GetNatureFromPersonality\n\ - ldrb r1, [r4, 0x5]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r1, r0\n\ - bne _081A4E96\n\ - ldr r4, [sp, 0x18]\n\ - movs r0, 0x64\n\ - adds r3, r4, 0\n\ - muls r3, r0\n\ - mov r8, r3\n\ - ldr r1, =gEnemyParty\n\ - add r1, r8\n\ - mov r10, r1\n\ - ldr r4, [sp, 0x14]\n\ - add r4, r9\n\ - lsls r4, 2\n\ - adds r0, r4, r5\n\ - adds r0, r6\n\ - ldr r2, =sFrontierBrainsMons\n\ - adds r0, r2\n\ - ldrh r1, [r0]\n\ - ldr r3, [sp, 0x3C]\n\ - lsrs r2, r3, 24\n\ - ldrb r3, [r0, 0x4]\n\ - movs r0, 0x1\n\ - str r0, [sp]\n\ - str r7, [sp, 0x4]\n\ - str r0, [sp, 0x8]\n\ - ldr r0, =0x0000ef2a\n\ - str r0, [sp, 0xC]\n\ - mov r0, r10\n\ - bl CreateMon\n\ - ldr r0, =sFrontierBrainsMons\n\ - adds r5, r0\n\ - adds r5, r6, r5\n\ - adds r4, r5, r4\n\ - adds r4, 0x2\n\ - mov r0, r10\n\ - movs r1, 0xC\n\ - adds r2, r4, 0\n\ - bl SetMonData\n\ - movs r7, 0\n\ - mov r6, r8\n\ - ldr r3, =gEnemyParty\n\ -_081A4F32:\n\ - adds r1, r7, 0\n\ - adds r1, 0x1A\n\ - ldr r0, [sp, 0x14]\n\ - add r0, r9\n\ - lsls r4, r0, 2\n\ - adds r2, r5, r4\n\ - adds r0, r7, 0x6\n\ - adds r2, r0\n\ - adds r0, r6, r3\n\ - str r3, [sp, 0x40]\n\ - bl SetMonData\n\ - adds r7, 0x1\n\ - ldr r3, [sp, 0x40]\n\ - cmp r7, 0x5\n\ - ble _081A4F32\n\ - movs r1, 0xFF\n\ - add r0, sp, 0x10\n\ - strb r1, [r0]\n\ - movs r7, 0\n\ - ldr r1, [sp, 0x18]\n\ - movs r2, 0x64\n\ - adds r6, r1, 0\n\ - muls r6, r2\n\ - ldr r3, =sFrontierBrainsMons + 0xC\n\ - mov r8, r3\n\ - ldr r3, =gEnemyParty\n\ - adds r5, r4, 0\n\ -_081A4F6A:\n\ - ldr r4, [sp, 0x38]\n\ - ldr r0, [sp, 0x24]\n\ - subs r1, r4, r0\n\ - lsls r1, 2\n\ - adds r1, r5, r1\n\ - ldr r2, [sp, 0x34]\n\ - ldr r4, [sp, 0x20]\n\ - subs r0, r2, r4\n\ - lsls r0, 3\n\ - adds r1, r0\n\ - add r1, r8\n\ - ldrh r4, [r1]\n\ - lsls r2, r7, 24\n\ - lsrs r2, 24\n\ - adds r0, r6, r3\n\ - adds r1, r4, 0\n\ - str r3, [sp, 0x40]\n\ - bl SetMonMoveSlot\n\ - ldr r3, [sp, 0x40]\n\ - cmp r4, 0xDA\n\ - bne _081A4F9C\n\ - movs r1, 0\n\ - add r0, sp, 0x10\n\ - strb r1, [r0]\n\ -_081A4F9C:\n\ - adds r5, 0x2\n\ - adds r7, 0x1\n\ - cmp r7, 0x3\n\ - ble _081A4F6A\n\ - ldr r0, [sp, 0x18]\n\ - movs r1, 0x64\n\ - adds r4, r0, 0\n\ - muls r4, r1\n\ - ldr r0, =gEnemyParty\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0x20\n\ - add r2, sp, 0x10\n\ - bl SetMonData\n\ - adds r0, r4, 0\n\ - bl CalculateMonStats\n\ - ldr r2, [sp, 0x2C]\n\ - str r2, [sp, 0x18]\n\ -_081A4FC4:\n\ - ldr r4, [sp, 0x30]\n\ - ldr r3, [sp, 0x28]\n\ - str r3, [sp, 0x14]\n\ - cmp r3, 0x2\n\ - bgt _081A4FD0\n\ - b _081A4E5C\n\ -_081A4FD0:\n\ - add sp, 0x44\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ -"); -} -#endif u16 GetFrontierBrainMonSpecies(u8 monId) { diff --git a/src/graphics.c b/src/graphics.c index 46da9ebc22..8f8ced5cb5 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1057,10 +1057,9 @@ const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/b const u32 gUnknown_E6BC04[] = INCBIN_U32("graphics/unknown/unknown_E6BC04.bin.lz"); -const u32 sBlenderCenterGfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.lz"); - -const u32 gUnknown_08D91DB8[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz"); -const u32 gUnknown_08D927EC[] = INCBIN_U32("graphics/berry_blender/outer_map.bin.lz"); +const u32 gBerryBlenderCenter_Gfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.lz"); +const u32 gBerryBlenderOuter_Gfx[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz"); +const u32 gBerryBlenderOuter_Tilemap[] = INCBIN_U32("graphics/berry_blender/outer_map.bin.lz"); const u32 gBattleAnimBgPalette_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.gbapal.lz"); const u32 gBattleAnimBgImage_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.4bpp.lz"); @@ -1208,13 +1207,12 @@ const u32 gBattleAnimSpriteGfx_WhiteFeather[] = INCBIN_U32("graphics/battle_anim const u32 gBattleAnimSpritePal_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.4bpp.lz"); -const u16 gUnknown_08DBA518[] = INCBIN_U16("graphics/misc/cable_car_bg.gbapal"); -const u16 gCableCar_Pal[] = INCBIN_U16("graphics/misc/cable_car.gbapal"); - -const u32 gUnknown_08DBA5B8[] = INCBIN_U32("graphics/misc/cable_car_bg.4bpp.lz"); -const u32 gCableCar_Gfx[] = INCBIN_U32("graphics/misc/cable_car.4bpp.lz"); -const u32 gCableCarDoor_Gfx[] = INCBIN_U32("graphics/misc/cable_car_door.4bpp.lz"); -const u32 gCableCarCord_Gfx[] = INCBIN_U32("graphics/misc/cable_car_cord.4bpp.lz"); +const u16 gCableCarBg_Pal[] = INCBIN_U16("graphics/cable_car/bg.gbapal"); +const u16 gCableCar_Pal[] = INCBIN_U16("graphics/cable_car/cable_car.gbapal"); +const u32 gCableCarBg_Gfx[] = INCBIN_U32("graphics/cable_car/bg.4bpp.lz"); +const u32 gCableCar_Gfx[] = INCBIN_U32("graphics/cable_car/cable_car.4bpp.lz"); +const u32 gCableCarDoor_Gfx[] = INCBIN_U32("graphics/cable_car/door.4bpp.lz"); +const u32 gCableCarCable_Gfx[] = INCBIN_U32("graphics/cable_car/cable.4bpp.lz"); // Roulette const u32 gRouletteMenu_Gfx[] = INCBIN_U32("graphics/roulette/window.4bpp.lz"); @@ -1342,25 +1340,15 @@ const u16 gPokenavConditionMarker_Pal[] = INCBIN_U16("graphics/pokenav/condition const u8 gPokenavConditionMarker_Gfx[] = INCBIN_U8("graphics/pokenav/condition/marker.4bpp"); const u16 gBerryBlenderMiscPalette[] = INCBIN_U16("graphics/berry_blender/misc.gbapal"); - const u16 gBerryBlenderArrowPalette[] = INCBIN_U16("graphics/berry_blender/arrow.gbapal"); - const u8 gBerryBlenderBetaArrow_Gfx[] = INCBIN_U8("graphics/berry_blender/arrow_old.4bpp"); //unused - -const u8 gBerryBlenderMarubatsuTiles[] = INCBIN_U8("graphics/berry_blender/marubatsu.4bpp"); - -const u8 gBerryBlenderParticlesTiles[] = INCBIN_U8("graphics/berry_blender/particles.4bpp"); - +const u8 gBerryBlenderScoreSymbols_Gfx[] = INCBIN_U8("graphics/berry_blender/score_symbols.4bpp"); +const u8 gBerryBlenderParticles_Gfx[] = INCBIN_U8("graphics/berry_blender/particles.4bpp"); static const u8 sEmpty0[0x120] = {0}; - -const u8 gBerryBlenderCountdownNumbersTiles[] = INCBIN_U8("graphics/berry_blender/countdown_numbers.4bpp"); - -const u8 gBerryBlenderStartTiles[] = INCBIN_U8("graphics/berry_blender/start.4bpp"); - +const u8 gBerryBlenderCountdownNumbers_Gfx[] = INCBIN_U8("graphics/berry_blender/countdown_numbers.4bpp"); +const u8 gBerryBlenderStart_Gfx[] = INCBIN_U8("graphics/berry_blender/start.4bpp"); static const u8 sEmpty1[0x200] = {0}; - -const u8 gBerryBlenderArrowTiles[] = INCBIN_U8("graphics/berry_blender/arrow.4bpp"); - +const u8 gBerryBlenderPlayerArrow_Gfx[] = INCBIN_U8("graphics/berry_blender/arrow.4bpp"); static const u8 sEmpty2[0x2C0] = {0}; const u16 gEasyChatCursor_Pal[] = INCBIN_U16("graphics/easy_chat/cursor.gbapal"); @@ -1375,11 +1363,11 @@ const u16 gEasyChatMode_Pal[] = INCBIN_U16("graphics/easy_chat/mode.gbapal"); const u32 gEasyChatWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/window.4bpp.lz"); // uses mode pal const u32 gEasyChatWindow_Tilemap[] = INCBIN_U32("graphics/easy_chat/window.bin.lz"); -const u16 gWallclockMale_Pal[] = INCBIN_U16("graphics/interface/wallclock_male.gbapal"); -const u16 gWallclockFemale_Pal[] = INCBIN_U16("graphics/interface/wallclock_female.gbapal"); -const u32 gWallclock_Gfx[] = INCBIN_U32("graphics/interface/wallclock.4bpp.lz"); -const u32 gUnknown_08DCC648[] = INCBIN_U32("graphics/interface/wallclock1.bin.lz"); -const u32 gUnknown_08DCC908[] = INCBIN_U32("graphics/interface/wallclock2.bin.lz"); +const u16 gWallClockMale_Pal[] = INCBIN_U16("graphics/wallclock/male.gbapal"); +const u16 gWallClockFemale_Pal[] = INCBIN_U16("graphics/wallclock/female.gbapal"); +const u32 gWallClock_Gfx[] = INCBIN_U32("graphics/wallclock/clock.4bpp.lz"); +const u32 gWallClockStart_Tilemap[] = INCBIN_U32("graphics/wallclock/clock_start.bin.lz"); +const u32 gWallClockView_Tilemap[] = INCBIN_U32("graphics/wallclock/clock_view.bin.lz"); const u16 gUsePokeblockCondition_Pal[] = INCBIN_U16("graphics/pokeblock/use_screen/condition.gbapal"); const u32 gUsePokeblockCondition_Gfx[] = INCBIN_U32("graphics/pokeblock/use_screen/condition.4bpp.lz"); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 9346497dd0..6e4f208495 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -396,7 +396,7 @@ static bool8 InitHallOfFameScreen(void) if (!gPaletteFade.active) { SetMainCallback2(CB2_HallOfFame); - PlayBGM(MUS_DENDOU); + PlayBGM(MUS_HALL_OF_FAME); return FALSE; } break; @@ -648,7 +648,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) } HallOfFame_PrintWelcomeText(0, 15); - PlaySE(SE_DENDOU); + PlaySE(SE_APPLAUSE); gTasks[taskId].tFrameCount = 400; gTasks[taskId].func = Task_Hof_DoConfetti; } @@ -730,7 +730,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId) static void Task_Hof_ExitOnKeyPressed(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { FadeOutBGM(4); gTasks[taskId].func = Task_Hof_HandlePaletteOnExit; @@ -992,7 +992,7 @@ static void Task_HofPC_HandleInput(u8 taskId) { u16 i; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (gTasks[taskId].tCurrTeamNo != 0) // prepare another team to view { @@ -1020,7 +1020,7 @@ static void Task_HofPC_HandleInput(u8 taskId) gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; } } - else if (gMain.newKeys & B_BUTTON) // turn off hall of fame PC + else if (JOY_NEW(B_BUTTON)) // turn off hall of fame PC { if (IsCryPlayingOrClearCrySongs()) { @@ -1029,12 +1029,12 @@ static void Task_HofPC_HandleInput(u8 taskId) } gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; } - else if (gMain.newKeys & DPAD_UP && gTasks[taskId].tCurrMonId != 0) // change mon -1 + else if (JOY_NEW(DPAD_UP) && gTasks[taskId].tCurrMonId != 0) // change mon -1 { gTasks[taskId].tCurrMonId--; gTasks[taskId].func = Task_HofPC_PrintMonInfo; } - else if (gMain.newKeys & DPAD_DOWN && gTasks[taskId].tCurrMonId < gTasks[taskId].tMonNo - 1) // change mon +1 + else if (JOY_NEW(DPAD_DOWN) && gTasks[taskId].tCurrMonId < gTasks[taskId].tMonNo - 1) // change mon +1 { gTasks[taskId].tCurrMonId++; gTasks[taskId].func = Task_HofPC_PrintMonInfo; @@ -1098,7 +1098,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) static void Task_HofPC_ExitOnButtonPress(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; } diff --git a/src/intro.c b/src/intro.c index 72aefd737a..eca8b84b16 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1129,7 +1129,7 @@ static void Task_IntroFadeIn(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON); gTasks[taskId].func = Task_IntroWaterDrops; gIntroFrameCounter = 0; - m4aSongNumStart(MUS_DEMO1); + m4aSongNumStart(MUS_INTRO); ResetSerial(); } @@ -1563,7 +1563,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); gTasks[taskId].func = Task_IntroSpinAndZoomPokeball; gIntroFrameCounter = 0; - m4aSongNumStart(MUS_T_BATTLE); + m4aSongNumStart(MUS_INTRO_BATTLE); } static void Task_IntroSpinAndZoomPokeball(u8 taskId) @@ -2355,7 +2355,7 @@ static void Task_IntroRayquazaGlowScene_1(u8 taskId) if (data[1] == 6) { spriteId = CreateSprite(&gIntroRayquazaHyperbeamSprite, 120, 88, 15); - PlaySE(SE_OP_BASYU); + PlaySE(SE_INTRO_BLAST); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[3] = data[4]; data[0]++; diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 04e2216f64..45cc24e5c8 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -824,7 +824,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(OBJ_VRAM0)); LoadPalette(&gUnknown_085F1668, 256, 32); sub_817B76C(); break; @@ -834,7 +834,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0D5C, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(OBJ_VRAM0)); LoadPalette(&gUnknown_085F1688, 256, 32); sub_817B76C(); break; diff --git a/src/item.c b/src/item.c index 44b73802bc..5a77d363ec 100644 --- a/src/item.c +++ b/src/item.c @@ -247,7 +247,8 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count) NAKED bool8 CheckBagHasSpace(u16 itemId, u16 count) { - asm_unified("push {r4-r7,lr}\n\ + asm_unified( + "push {r4-r7,lr}\n\ mov r7, r10\n\ mov r6, r9\n\ mov r5, r8\n\ diff --git a/src/item_menu.c b/src/item_menu.c index ae09ec7edf..1d74210c74 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -52,6 +52,13 @@ #include "battle_pike.h" #include "constants/rgb.h" +enum +{ + SWITCH_POCKET_NONE, + SWITCH_POCKET_LEFT, + SWITCH_POCKET_RIGHT +}; + void GoToBagMenu(u8 bagMenuType, u8 pocketId, void (*postExitMenuMainCallback2)()); void CB2_Bag(void); bool8 SetupBagMenu(void); @@ -62,7 +69,7 @@ void AllocateBagItemListBuffers(void); void LoadBagItemListBuffers(u8); void BagMenu_PrintPocketNames(const u8*, const u8*); void BagMenu_CopyPocketNameToWindow(u32); -void BagMenu_DrawPocketIndicatorSquare(u8, u8); +static void DrawPocketIndicatorSquare(u8 x, bool8 isCurrentPocket); void CreatePocketScrollArrowPair(void); void CreatePocketSwitchArrowPair(void); void BagMenu_PrepareTMHMMoveWindow(void); @@ -80,16 +87,16 @@ u16 BagGetQuantityByPocketPosition(u8, u16); void BagDestroyPocketSwitchArrowPair(void); void TaskCloseBagMenu_2(u8); u8 AddItemMessageWindow(u8); -void bag_menu_RemoveBagItem_message_window(u8); +void BagMenu_RemoveBagItemMessageindow(u8); void set_callback3_to_bag(u8); void PrintItemDepositAmount(u8, s16); -u8 BagMenu_AddWindow(u8); -u8 GetSwitchBagPocketDirection(void); -void SwitchBagPocket(u8, s16, u16); -bool8 sub_81AC2C0(void); -void BagMenu_SwapItems(u8); -void sub_81AC10C(u8); -void sub_81AC3C0(u8); +static u8 BagMenu_AddWindow(u8); +static u8 GetSwitchBagPocketDirection(void); +static void SwitchBagPocket(u8, s16, u16); +static bool8 CanSwapItems(void); +static void BagMenu_SwapItems(u8 taskId); +static void sub_81AC10C(u8); +static void Task_HandleSwappingItemsInput(u8); void sub_81AC498(u8); void sub_81AC590(u8); void PrintTMHMMoveData(u16); @@ -106,19 +113,18 @@ void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); void Task_ActuallyToss(u8); void ItemMenu_Cancel(u8); void sub_81AD350(u8); -void BagMenu_PrintItemCantBeHeld(u8); -void DisplayCurrentMoneyWindow(void); -void DisplaySellItemPriceAndConfirm(u8); +static void BagMenu_PrintItemCantBeHeld(u8); +static void DisplayCurrentMoneyWindow(void); +static void DisplaySellItemPriceAndConfirm(u8); void sub_81AD730(u8); void sub_81AD6E4(u8); -void bag_menu_remove_money_window(void); -void bag_menu_RemoveBagItem_message_window(u8); -void Task_BuyHowManyDialogueHandleInput(u8); -void sub_81AD8C8(u8); -void sub_81AD9C0(u8); -void sub_81ADB14(u8); -void sub_81ADA7C(u8); -void sub_81ADC0C(u8); +static void RemoveMoneyWindow(void); +static void Task_SellHowManyDialogueHandleInput(u8); +static void BagMenu_Sell_UpdateItemListAndMoney(u8); +static void BagMenu_Sell_WaitForABPress(u8); +static void BagMenu_TryDepositItem(u8); +static void Task_ChooseHowManyToDeposit(u8 taskId); +static void BagMenu_Deposit_WaitForABPress(u8); void CB2_ApprenticeExitBagMenu(void); void CB2_FavorLadyExitBagMenu(void); void CB2_QuizLadyExitBagMenu(void); @@ -528,14 +534,16 @@ void CB2_BagMenuFromBattle(void) GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2); } +// Choosing berry to plant void CB2_ChooseBerry(void) { GoToBagMenu(ITEMMENULOCATION_BERRY_TREE, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } -void ChooseBerrySetCallback(void (*callback)(void)) +// Choosing berry for Berry Blender or Berry Crush +void ChooseBerryForMachine(void (*exitCallback)(void)) { - GoToBagMenu(ITEMMENULOCATION_BERRY_BLENDER_CRUSH, BERRIES_POCKET, callback); + GoToBagMenu(ITEMMENULOCATION_BERRY_BLENDER_CRUSH, BERRIES_POCKET, exitCallback); } void CB2_GoToSellMenu(void) @@ -686,7 +694,7 @@ bool8 SetupBagMenu(void) case 13: BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], 0); BagMenu_CopyPocketNameToWindow(0); - BagMenu_DrawPocketIndicatorSquare(gBagPositionStruct.pocket, 1); + DrawPocketIndicatorSquare(gBagPositionStruct.pocket, TRUE); gMain.state++; break; case 14: @@ -1109,7 +1117,7 @@ void BagMenu_InitListsMenu(u8 taskId) s16* data = gTasks[taskId].data; u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; - bag_menu_RemoveBagItem_message_window(4); + BagMenu_RemoveBagItemMessageindow(4); DestroyListMenuTask(data[0], scrollPos, cursorPos); UpdatePocketItemList(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); @@ -1152,16 +1160,16 @@ void Task_BagMenu_HandleInput(u8 taskId) { switch (GetSwitchBagPocketDirection()) { - case 1: - SwitchBagPocket(taskId, -1, 0); + case SWITCH_POCKET_LEFT: + SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, 0); return; - case 2: - SwitchBagPocket(taskId, 1, 0); + case SWITCH_POCKET_RIGHT: + SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 0); return; default: - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { - if (sub_81AC2C0() == 1) + if (CanSwapItems() == TRUE) { ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); if ((*scrollPos + *cursorPos) != gBagMenu->numItemStacks[gBagPositionStruct.pocket] - 1) @@ -1184,7 +1192,7 @@ void Task_BagMenu_HandleInput(u8 taskId) case LIST_CANCEL: if (gBagPositionStruct.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; } PlaySE(SE_SELECT); @@ -1215,26 +1223,26 @@ void set_callback3_to_bag(u8 taskId) gTasks[taskId].func = Task_BagMenu_HandleInput; } -u8 GetSwitchBagPocketDirection(void) +static u8 GetSwitchBagPocketDirection(void) { u8 LRKeys; if (gBagMenu->pocketSwitchDisabled) - return 0; + return SWITCH_POCKET_NONE; LRKeys = GetLRKeysPressed(); - if ((gMain.newKeys & DPAD_LEFT) || LRKeys == MENU_L_PRESSED) + if (JOY_NEW(DPAD_LEFT) || LRKeys == MENU_L_PRESSED) { PlaySE(SE_SELECT); - return 1; + return SWITCH_POCKET_LEFT; } - if ((gMain.newKeys & DPAD_RIGHT) || LRKeys == MENU_R_PRESSED) + if (JOY_NEW(DPAD_RIGHT) || LRKeys == MENU_R_PRESSED) { PlaySE(SE_SELECT); - return 2; + return SWITCH_POCKET_RIGHT; } - return 0; + return SWITCH_POCKET_NONE; } -void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId) +static void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId) { if (deltaBagPocketId == 1 && *bagPocketId == POCKETS_COUNT - 1) *bagPocketId = 0; @@ -1244,7 +1252,7 @@ void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId) *bagPocketId += deltaBagPocketId; } -void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) +static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) { s16* data = gTasks[taskId].data; u8 pocketId; @@ -1263,7 +1271,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) } pocketId = gBagPositionStruct.pocket; ChangeBagPocketId(&pocketId, deltaBagPocketId); - if (deltaBagPocketId == 1) + if (deltaBagPocketId == MENU_CURSOR_DELTA_RIGHT) { BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], gPocketNamesStringsTable[pocketId]); BagMenu_CopyPocketNameToWindow(0); @@ -1273,8 +1281,8 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) BagMenu_PrintPocketNames(gPocketNamesStringsTable[pocketId], gPocketNamesStringsTable[gBagPositionStruct.pocket]); BagMenu_CopyPocketNameToWindow(8); } - BagMenu_DrawPocketIndicatorSquare(gBagPositionStruct.pocket, 0); - BagMenu_DrawPocketIndicatorSquare(pocketId, 1); + DrawPocketIndicatorSquare(gBagPositionStruct.pocket, FALSE); + DrawPocketIndicatorSquare(pocketId, TRUE); FillBgTilemapBufferRect_Palette0(2, 11, 14, 2, 15, 16); ScheduleBgCopyTilemapToVram(2); SetBagVisualPocketId(pocketId, 1); @@ -1291,15 +1299,15 @@ void sub_81AC10C(u8 taskId) { switch (GetSwitchBagPocketDirection()) { - case 1: + case SWITCH_POCKET_LEFT: ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]); SwitchTaskToFollowupFunc(taskId); - SwitchBagPocket(taskId, -1, 1); + SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, 1); return; - case 2: + case SWITCH_POCKET_RIGHT: ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]); SwitchTaskToFollowupFunc(taskId); - SwitchBagPocket(taskId, 1, 1); + SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 1); return; } } @@ -1336,16 +1344,16 @@ void sub_81AC23C(u8 a) ScheduleBgCopyTilemapToVram(2); } -void BagMenu_DrawPocketIndicatorSquare(u8 x, u8 is_current_bag) +static void DrawPocketIndicatorSquare(u8 x, bool8 isCurrentPocket) { - if (is_current_bag == 0) + if (!isCurrentPocket) FillBgTilemapBufferRect_Palette0(2, 0x1017, x + 5, 3, 1, 1); else FillBgTilemapBufferRect_Palette0(2, 0x102B, x + 5, 3, 1, 1); ScheduleBgCopyTilemapToVram(2); } -bool8 sub_81AC2C0(void) +static bool8 CanSwapItems(void) { if (gBagPositionStruct.location <= ITEMMENULOCATION_BATTLE) { @@ -1370,17 +1378,17 @@ void BagMenu_SwapItems(u8 taskId) sub_80D4FEC(data[1]); BagDestroyPocketSwitchArrowPair(); BagMenu_PrintCursor_(data[0], 2); - gTasks[taskId].func = sub_81AC3C0; + gTasks[taskId].func = Task_HandleSwappingItemsInput; } -void sub_81AC3C0(u8 taskId) +static void Task_HandleSwappingItemsInput(u8 taskId) { s16* data = gTasks[taskId].data; int input; if (MenuHelpers_CallLinkSomething() != TRUE) { - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { PlaySE(SE_SELECT); ListMenuGetScrollAndRow(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]); @@ -1398,7 +1406,7 @@ void sub_81AC3C0(u8 taskId) break; case LIST_CANCEL: PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) sub_81AC498(taskId); else sub_81AC590(taskId); @@ -1637,44 +1645,44 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId) if (MenuHelpers_CallLinkSomething() != TRUE) { s8 cursorPos = Menu_GetCursorPos(); - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { if (cursorPos > 0 && sub_81ACDFC(cursorPos - 2)) { PlaySE(SE_SELECT); - sub_8199134(0, -1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP); } } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (cursorPos < (gBagMenu->contextMenuNumItems - 2) && sub_81ACDFC(cursorPos + 2)) { PlaySE(SE_SELECT); - sub_8199134(0, 1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN); } } - else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) + else if ((JOY_NEW(DPAD_LEFT)) || GetLRKeysPressed() == MENU_L_PRESSED) { if ((cursorPos & 1) && sub_81ACDFC(cursorPos - 1)) { PlaySE(SE_SELECT); - sub_8199134(-1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); } } - else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { if (!(cursorPos & 1) && sub_81ACDFC(cursorPos + 1)) { PlaySE(SE_SELECT); - sub_8199134(1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE); } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sItemMenuActions[gBagMenu->contextMenuItemsPtr[cursorPos]].func.void_u8(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sItemMenuActions[ITEMMENUACTION_CANCEL].func.void_u8(taskId); @@ -1778,13 +1786,13 @@ void Task_ChooseHowManyToToss(u8 taskId) { PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); BagMenu_RemoveWindow(7); BagMenu_TossItems(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); BagMenu_RemoveWindow(7); @@ -1810,7 +1818,7 @@ void Task_ActuallyToss(u8 taskId) u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); RemoveBagItem(gSpecialVar_ItemId, tItemCount); @@ -1869,7 +1877,7 @@ void BagMenu_PrintThereIsNoPokemon(u8 taskId) DisplayItemMessage(taskId, 1, gText_NoPokemon, sub_81AD350); } -void BagMenu_PrintItemCantBeHeld(u8 taskId) +static void BagMenu_PrintItemCantBeHeld(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeld); @@ -1878,7 +1886,7 @@ void BagMenu_PrintItemCantBeHeld(u8 taskId) void sub_81AD350(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); BagMenu_InitListsMenu(taskId); @@ -2010,7 +2018,7 @@ void Task_ItemContext_Sell(u8 taskId) } } -void DisplaySellItemPriceAndConfirm(u8 taskId) +static void DisplaySellItemPriceAndConfirm(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2028,8 +2036,8 @@ void BagMenu_CancelSell(u8 taskId) { s16* data = gTasks[taskId].data; - bag_menu_remove_money_window(); - bag_menu_RemoveBagItem_message_window(4); + RemoveMoneyWindow(); + BagMenu_RemoveBagItemMessageindow(4); BagMenu_PrintCursor_(data[0], 0); set_callback3_to_bag(taskId); } @@ -2041,10 +2049,10 @@ void sub_81AD730(u8 taskId) PrintItemSoldAmount(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount); DisplayCurrentMoneyWindow(); - gTasks[taskId].func = Task_BuyHowManyDialogueHandleInput; + gTasks[taskId].func = Task_SellHowManyDialogueHandleInput; } -void Task_BuyHowManyDialogueHandleInput(u8 taskId) +static void Task_SellHowManyDialogueHandleInput(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2052,19 +2060,19 @@ void Task_BuyHowManyDialogueHandleInput(u8 taskId) { PrintItemSoldAmount(gBagMenu->windowPointers[8], tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); BagMenu_RemoveWindow(8); DisplaySellItemPriceAndConfirm(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); BagMenu_PrintCursor_(data[0], 0); - bag_menu_remove_money_window(); + RemoveMoneyWindow(); BagMenu_RemoveWindow(8); - bag_menu_RemoveBagItem_message_window(4); + BagMenu_RemoveBagItemMessageindow(4); set_callback3_to_bag(taskId); } } @@ -2076,16 +2084,16 @@ void BagMenu_ConfirmSell(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar2); ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2); - DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD8C8); + DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_Sell_UpdateItemListAndMoney); } -void sub_81AD8C8(u8 taskId) +static void BagMenu_Sell_UpdateItemListAndMoney(u8 taskId) { s16* data = gTasks[taskId].data; u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; - PlaySE(SE_REGI); + PlaySE(SE_SHOP); RemoveBagItem(gSpecialVar_ItemId, tItemCount); AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount); DestroyListMenuTask(data[0], scrollPos, cursorPos); @@ -2095,15 +2103,15 @@ void sub_81AD8C8(u8 taskId) data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); BagMenu_PrintCursor_(data[0], 2); PrintMoneyAmountInMoneyBox(gBagMenu->windowPointers[9], GetMoney(&gSaveBlock1Ptr->money), 0); - gTasks[taskId].func = sub_81AD9C0; + gTasks[taskId].func = BagMenu_Sell_WaitForABPress; } -void sub_81AD9C0(u8 taskId) +static void BagMenu_Sell_WaitForABPress(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); - bag_menu_remove_money_window(); + RemoveMoneyWindow(); BagMenu_InitListsMenu(taskId); } } @@ -2115,7 +2123,7 @@ void Task_ItemContext_Deposit(u8 taskId) tItemCount = 1; if (data[2] == 1) { - sub_81ADB14(taskId); + BagMenu_TryDepositItem(taskId); } else { @@ -2124,11 +2132,11 @@ void Task_ItemContext_Deposit(u8 taskId) FillWindowPixelBuffer(1, PIXEL_FILL(0)); BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); - gTasks[taskId].func = sub_81ADA7C; + gTasks[taskId].func = Task_ChooseHowManyToDeposit; } } -void sub_81ADA7C(u8 taskId) +static void Task_ChooseHowManyToDeposit(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2136,13 +2144,13 @@ void sub_81ADA7C(u8 taskId) { PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); BagMenu_RemoveWindow(7); - sub_81ADB14(taskId); + BagMenu_TryDepositItem(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); BagMenu_PrintDescription(data[1]); @@ -2152,7 +2160,7 @@ void sub_81ADA7C(u8 taskId) } } -void sub_81ADB14(u8 taskId) +static void BagMenu_TryDepositItem(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2160,7 +2168,7 @@ void sub_81ADB14(u8 taskId) if (ItemId_GetImportance(gSpecialVar_ItemId)) { BagMenu_Print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); - gTasks[taskId].func = sub_81ADC0C; + gTasks[taskId].func = BagMenu_Deposit_WaitForABPress; } else if (AddPCItem(gSpecialVar_ItemId, tItemCount) == TRUE) { @@ -2173,15 +2181,15 @@ void sub_81ADB14(u8 taskId) else { BagMenu_Print(1, 1, gText_NoRoomForItems, 3, 1, 0, 0, 0, 0); - gTasks[taskId].func = sub_81ADC0C; + gTasks[taskId].func = BagMenu_Deposit_WaitForABPress; } } -void sub_81ADC0C(u8 taskId) +static void BagMenu_Deposit_WaitForABPress(u8 taskId) { s16* data = gTasks[taskId].data; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); BagMenu_PrintDescription(data[1]); @@ -2248,7 +2256,7 @@ void Task_WallyTutorialBagMenu(u8 taskId) { case 0x66: PlaySE(SE_SELECT); - SwitchBagPocket(taskId, 1, 0); + SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 0); data[8]++; break; case 0xCC: @@ -2414,7 +2422,7 @@ u8 AddItemMessageWindow(u8 which) return *ptr; } -void bag_menu_RemoveBagItem_message_window(u8 which) +void BagMenu_RemoveBagItemMessageindow(u8 which) { u8 *ptr = &gBagMenu->windowPointers[which]; if (*ptr != 0xFF) @@ -2433,14 +2441,14 @@ void BagMenu_YesNo(u8 a, u8 b, const struct YesNoFuncTable *funcTable) CreateYesNoMenuWithCallbacks(a, &sContextMenuWindowTemplates[b], 1, 0, 2, 1, 14, funcTable); } -void DisplayCurrentMoneyWindow(void) +static void DisplayCurrentMoneyWindow(void) { u8 windowId = BagMenu_AddWindow(9); PrintMoneyAmountInMoneyBoxWithBorder(windowId, 1, 14, GetMoney(&gSaveBlock1Ptr->money)); AddMoneyLabelObject(19, 11); } -void bag_menu_remove_money_window(void) +static void RemoveMoneyWindow(void) { BagMenu_RemoveWindow(9); RemoveMoneyLabelObject(); diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index cfafcbb75b..cc51236c83 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -310,51 +310,51 @@ static const struct SpriteTemplate gBerryPicRotatingSpriteTemplate = .callback = SpriteCallbackDummy, }; -static const struct CompressedTilesPal gBerryPicTable[] = +static const struct CompressedTilesPal sBerryPicTable[] = { - {gBerryPic_Cheri, gBerryPalette_Cheri}, - {gBerryPic_Chesto, gBerryPalette_Chesto}, - {gBerryPic_Pecha, gBerryPalette_Pecha}, - {gBerryPic_Rawst, gBerryPalette_Rawst}, - {gBerryPic_Aspear, gBerryPalette_Aspear}, - {gBerryPic_Leppa, gBerryPalette_Leppa}, - {gBerryPic_Oran, gBerryPalette_Oran}, - {gBerryPic_Persim, gBerryPalette_Persim}, - {gBerryPic_Lum, gBerryPalette_Lum}, - {gBerryPic_Sitrus, gBerryPalette_Sitrus}, - {gBerryPic_Figy, gBerryPalette_Figy}, - {gBerryPic_Wiki, gBerryPalette_Wiki}, - {gBerryPic_Mago, gBerryPalette_Mago}, - {gBerryPic_Aguav, gBerryPalette_Aguav}, - {gBerryPic_Iapapa, gBerryPalette_Iapapa}, - {gBerryPic_Razz, gBerryPalette_Razz}, - {gBerryPic_Bluk, gBerryPalette_Bluk}, - {gBerryPic_Nanab, gBerryPalette_Nanab}, - {gBerryPic_Wepear, gBerryPalette_Wepear}, - {gBerryPic_Pinap, gBerryPalette_Pinap}, - {gBerryPic_Pomeg, gBerryPalette_Pomeg}, - {gBerryPic_Kelpsy, gBerryPalette_Kelpsy}, - {gBerryPic_Qualot, gBerryPalette_Qualot}, - {gBerryPic_Hondew, gBerryPalette_Hondew}, - {gBerryPic_Grepa, gBerryPalette_Grepa}, - {gBerryPic_Tamato, gBerryPalette_Tamato}, - {gBerryPic_Cornn, gBerryPalette_Cornn}, - {gBerryPic_Magost, gBerryPalette_Magost}, - {gBerryPic_Rabuta, gBerryPalette_Rabuta}, - {gBerryPic_Nomel, gBerryPalette_Nomel}, - {gBerryPic_Spelon, gBerryPalette_Spelon}, - {gBerryPic_Pamtre, gBerryPalette_Pamtre}, - {gBerryPic_Watmel, gBerryPalette_Watmel}, - {gBerryPic_Durin, gBerryPalette_Durin}, - {gBerryPic_Belue, gBerryPalette_Belue}, - {gBerryPic_Liechi, gBerryPalette_Liechi}, - {gBerryPic_Ganlon, gBerryPalette_Ganlon}, - {gBerryPic_Salac, gBerryPalette_Salac}, - {gBerryPic_Petaya, gBerryPalette_Petaya}, - {gBerryPic_Apicot, gBerryPalette_Apicot}, - {gBerryPic_Lansat, gBerryPalette_Lansat}, - {gBerryPic_Starf, gBerryPalette_Starf}, - {gBerryPic_Enigma, gBerryPalette_Enigma}, + [ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1] = {gBerryPic_Cheri, gBerryPalette_Cheri}, + [ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1] = {gBerryPic_Chesto, gBerryPalette_Chesto}, + [ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1] = {gBerryPic_Pecha, gBerryPalette_Pecha}, + [ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1] = {gBerryPic_Rawst, gBerryPalette_Rawst}, + [ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1] = {gBerryPic_Aspear, gBerryPalette_Aspear}, + [ITEM_TO_BERRY(ITEM_LEPPA_BERRY) - 1] = {gBerryPic_Leppa, gBerryPalette_Leppa}, + [ITEM_TO_BERRY(ITEM_ORAN_BERRY) - 1] = {gBerryPic_Oran, gBerryPalette_Oran}, + [ITEM_TO_BERRY(ITEM_PERSIM_BERRY) - 1] = {gBerryPic_Persim, gBerryPalette_Persim}, + [ITEM_TO_BERRY(ITEM_LUM_BERRY) - 1] = {gBerryPic_Lum, gBerryPalette_Lum}, + [ITEM_TO_BERRY(ITEM_SITRUS_BERRY) - 1] = {gBerryPic_Sitrus, gBerryPalette_Sitrus}, + [ITEM_TO_BERRY(ITEM_FIGY_BERRY) - 1] = {gBerryPic_Figy, gBerryPalette_Figy}, + [ITEM_TO_BERRY(ITEM_WIKI_BERRY) - 1] = {gBerryPic_Wiki, gBerryPalette_Wiki}, + [ITEM_TO_BERRY(ITEM_MAGO_BERRY) - 1] = {gBerryPic_Mago, gBerryPalette_Mago}, + [ITEM_TO_BERRY(ITEM_AGUAV_BERRY) - 1] = {gBerryPic_Aguav, gBerryPalette_Aguav}, + [ITEM_TO_BERRY(ITEM_IAPAPA_BERRY) - 1] = {gBerryPic_Iapapa, gBerryPalette_Iapapa}, + [ITEM_TO_BERRY(ITEM_RAZZ_BERRY) - 1] = {gBerryPic_Razz, gBerryPalette_Razz}, + [ITEM_TO_BERRY(ITEM_BLUK_BERRY) - 1] = {gBerryPic_Bluk, gBerryPalette_Bluk}, + [ITEM_TO_BERRY(ITEM_NANAB_BERRY) - 1] = {gBerryPic_Nanab, gBerryPalette_Nanab}, + [ITEM_TO_BERRY(ITEM_WEPEAR_BERRY) - 1] = {gBerryPic_Wepear, gBerryPalette_Wepear}, + [ITEM_TO_BERRY(ITEM_PINAP_BERRY) - 1] = {gBerryPic_Pinap, gBerryPalette_Pinap}, + [ITEM_TO_BERRY(ITEM_POMEG_BERRY) - 1] = {gBerryPic_Pomeg, gBerryPalette_Pomeg}, + [ITEM_TO_BERRY(ITEM_KELPSY_BERRY) - 1] = {gBerryPic_Kelpsy, gBerryPalette_Kelpsy}, + [ITEM_TO_BERRY(ITEM_QUALOT_BERRY) - 1] = {gBerryPic_Qualot, gBerryPalette_Qualot}, + [ITEM_TO_BERRY(ITEM_HONDEW_BERRY) - 1] = {gBerryPic_Hondew, gBerryPalette_Hondew}, + [ITEM_TO_BERRY(ITEM_GREPA_BERRY) - 1] = {gBerryPic_Grepa, gBerryPalette_Grepa}, + [ITEM_TO_BERRY(ITEM_TAMATO_BERRY) - 1] = {gBerryPic_Tamato, gBerryPalette_Tamato}, + [ITEM_TO_BERRY(ITEM_CORNN_BERRY) - 1] = {gBerryPic_Cornn, gBerryPalette_Cornn}, + [ITEM_TO_BERRY(ITEM_MAGOST_BERRY) - 1] = {gBerryPic_Magost, gBerryPalette_Magost}, + [ITEM_TO_BERRY(ITEM_RABUTA_BERRY) - 1] = {gBerryPic_Rabuta, gBerryPalette_Rabuta}, + [ITEM_TO_BERRY(ITEM_NOMEL_BERRY) - 1] = {gBerryPic_Nomel, gBerryPalette_Nomel}, + [ITEM_TO_BERRY(ITEM_SPELON_BERRY) - 1] = {gBerryPic_Spelon, gBerryPalette_Spelon}, + [ITEM_TO_BERRY(ITEM_PAMTRE_BERRY) - 1] = {gBerryPic_Pamtre, gBerryPalette_Pamtre}, + [ITEM_TO_BERRY(ITEM_WATMEL_BERRY) - 1] = {gBerryPic_Watmel, gBerryPalette_Watmel}, + [ITEM_TO_BERRY(ITEM_DURIN_BERRY) - 1] = {gBerryPic_Durin, gBerryPalette_Durin}, + [ITEM_TO_BERRY(ITEM_BELUE_BERRY) - 1] = {gBerryPic_Belue, gBerryPalette_Belue}, + [ITEM_TO_BERRY(ITEM_LIECHI_BERRY) - 1] = {gBerryPic_Liechi, gBerryPalette_Liechi}, + [ITEM_TO_BERRY(ITEM_GANLON_BERRY) - 1] = {gBerryPic_Ganlon, gBerryPalette_Ganlon}, + [ITEM_TO_BERRY(ITEM_SALAC_BERRY) - 1] = {gBerryPic_Salac, gBerryPalette_Salac}, + [ITEM_TO_BERRY(ITEM_PETAYA_BERRY) - 1] = {gBerryPic_Petaya, gBerryPalette_Petaya}, + [ITEM_TO_BERRY(ITEM_APICOT_BERRY) - 1] = {gBerryPic_Apicot, gBerryPalette_Apicot}, + [ITEM_TO_BERRY(ITEM_LANSAT_BERRY) - 1] = {gBerryPic_Lansat, gBerryPalette_Lansat}, + [ITEM_TO_BERRY(ITEM_STARF_BERRY) - 1] = {gBerryPic_Starf, gBerryPalette_Starf}, + [ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma}, }; const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet = @@ -581,10 +581,10 @@ static void LoadBerryGfx(u8 berryId) // unknown empty if statement } - pal.data = gBerryPicTable[berryId].pal; + pal.data = sBerryPicTable[berryId].pal; pal.tag = TAG_BERRY_PIC_PAL; LoadCompressedSpritePalette(&pal); - LZDecompressWram(gBerryPicTable[berryId].tiles, &gDecompressionBuffer[0x1000]); + LZDecompressWram(sBerryPicTable[berryId].tiles, &gDecompressionBuffer[0x1000]); sub_80D5018(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]); } @@ -599,7 +599,8 @@ void FreeBerryTagSpritePalette(void) FreeSpritePaletteByTag(TAG_BERRY_PIC_PAL); } -u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine) +// For throwing berries into the Berry Blender +u8 CreateSpinningBerrySprite(u8 berryId, u8 x, u8 y, bool8 startAffine) { u8 spriteId; diff --git a/src/item_use.c b/src/item_use.c index 2c9ffaf32a..f9d1ff824b 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -328,7 +328,7 @@ static void Task_UseItemfinder(u8 taskId) } return; } - PlaySE(SE_DAUGI); + PlaySE(SE_ITEMFINDER); tItemfinderBeeps++; } tCounter = (tCounter + 1) & 0x1F; @@ -792,7 +792,7 @@ static void BootUpSoundTMHM(u8 taskId) static void Task_ShowTMHMContainedMessage(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]); StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1); @@ -845,7 +845,7 @@ static void Task_StartUseRepel(u8 taskId) if (++data[8] > 7) { data[8] = 0; - PlaySE(SE_TU_SAA); + PlaySE(SE_REPEL); gTasks[taskId].func = Task_UseRepel; } } @@ -867,7 +867,7 @@ static void Task_UsedBlackWhiteFlute(u8 taskId) { if(++gTasks[taskId].data[8] > 7) { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else @@ -956,7 +956,7 @@ void ItemUseInBattle_PokeBall(u8 taskId) static void Task_CloseStatIncreaseMessage(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { if (!InBattlePyramid()) Task_FadeAndCloseBagMenu(taskId); @@ -969,7 +969,7 @@ static void Task_UseStatIncreaseItem(u8 taskId) { if(++gTasks[taskId].data[8] > 7) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(gSpecialVar_ItemId, 1); if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage); diff --git a/src/link.c b/src/link.c index 62a9e41511..9fd35a10b6 100644 --- a/src/link.c +++ b/src/link.c @@ -99,7 +99,7 @@ u16 gLinkSavedIme; EWRAM_DATA u8 gLinkTestDebugValuesEnabled = 0; EWRAM_DATA u8 gUnknown_020223BD = 0; -EWRAM_DATA u32 gUnknown_020223C0 = 0; +EWRAM_DATA u32 gBerryBlenderKeySendAttempts = 0; EWRAM_DATA u16 gBlockRecvBuffer[MAX_RFU_PLAYERS][BLOCK_BUFFER_SIZE / 2] = {}; EWRAM_DATA u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE] = {}; EWRAM_DATA bool8 gLinkOpen = FALSE; @@ -445,27 +445,27 @@ static void TestBlockTransfer(u8 nothing, u8 is, u8 used) static void LinkTestProcessKeyInput(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { gShouldAdvanceLinkState = 1; } - if (gMain.heldKeys & B_BUTTON) + if (JOY_HELD(B_BUTTON)) { InitBlockSend(gHeap + 0x4000, 0x00002004); } - if (gMain.newKeys & L_BUTTON) + if (JOY_NEW(L_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0)); } - if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) { SetSuppressLinkErrorMessage(TRUE); } - if (gMain.newKeys & R_BUTTON) + if (JOY_NEW(R_BUTTON)) { TrySavingData(SAVE_LINK); } - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { SetCloseLinkCallback(); } @@ -552,7 +552,7 @@ static void ProcessRecvCmds(u8 unused) InitBlockSend(block, sizeof(*block)); break; } - case LINKCMD_SEND_HELD_KEYS: + case LINKCMD_BLENDER_SEND_KEYS: gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; break; case LINKCMD_0x5555: @@ -636,13 +636,13 @@ static void ProcessRecvCmds(u8 unused) case LINKCMD_READY_EXIT_STANDBY: gReadyToExitStandby[i] = TRUE; break; - case LINKCMD_0xAAAA: - sub_800A418(); + case LINKCMD_BLENDER_NO_PBLOCK_SPACE: + SetBerryBlenderLinkCallback(); break; case LINKCMD_SEND_BLOCK_REQ: SendBlock(0, sBlockRequests[gRecvCmds[i][1]].address, sBlockRequests[gRecvCmds[i][1]].size); break; - case LINKCMD_SEND_HELD_KEYS_2: + case LINKCMD_SEND_HELD_KEYS: gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; break; } @@ -660,8 +660,8 @@ static void BuildSendCmd(u16 command) case LINKCMD_READY_EXIT_STANDBY: gSendCmd[0] = LINKCMD_READY_EXIT_STANDBY; break; - case LINKCMD_SEND_HELD_KEYS: - gSendCmd[0] = LINKCMD_SEND_HELD_KEYS; + case LINKCMD_BLENDER_SEND_KEYS: + gSendCmd[0] = LINKCMD_BLENDER_SEND_KEYS; gSendCmd[1] = gMain.heldKeys; break; case LINKCMD_0x5555: @@ -687,8 +687,8 @@ static void BuildSendCmd(u16 command) gSendCmd[1] = sBlockSend.size; gSendCmd[2] = sBlockSend.multiplayerId + 0x80; break; - case LINKCMD_0xAAAA: - gSendCmd[0] = LINKCMD_0xAAAA; + case LINKCMD_BLENDER_NO_PBLOCK_SPACE: + gSendCmd[0] = LINKCMD_BLENDER_NO_PBLOCK_SPACE; break; case LINKCMD_0xAAAB: gSendCmd[0] = LINKCMD_0xAAAB; @@ -705,12 +705,12 @@ static void BuildSendCmd(u16 command) case LINKCMD_0x5566: gSendCmd[0] = LINKCMD_0x5566; break; - case LINKCMD_SEND_HELD_KEYS_2: + case LINKCMD_SEND_HELD_KEYS: if (gHeldKeyCodeToSend == 0 || gLinkTransferringData) { break; } - gSendCmd[0] = LINKCMD_SEND_HELD_KEYS_2; + gSendCmd[0] = LINKCMD_SEND_HELD_KEYS; gSendCmd[1] = gHeldKeyCodeToSend; break; } @@ -738,7 +738,7 @@ bool32 IsSendingKeysToLink(void) static void LinkCB_SendHeldKeys(void) { if (gReceivedRemoteLinkPlayers == TRUE) - BuildSendCmd(LINKCMD_SEND_HELD_KEYS_2); + BuildSendCmd(LINKCMD_SEND_HELD_KEYS); } void ClearLinkCallback(void) @@ -1009,34 +1009,36 @@ static void LinkCB_BlockSendEnd(void) gLinkCallback = NULL; } -static void sub_800A3F8(void) +static void LinkCB_BerryBlenderSendHeldKeys(void) { GetMultiplayerId(); - BuildSendCmd(LINKCMD_SEND_HELD_KEYS); - gUnknown_020223C0++; + BuildSendCmd(LINKCMD_BLENDER_SEND_KEYS); + gBerryBlenderKeySendAttempts++; } -void sub_800A418(void) +void SetBerryBlenderLinkCallback(void) { - gUnknown_020223C0 = 0; + gBerryBlenderKeySendAttempts = 0; if (gWirelessCommType) { - sub_800F850(); + Rfu_SetBerryBlenderLinkCallback(); } else { - gLinkCallback = sub_800A3F8; + gLinkCallback = LinkCB_BerryBlenderSendHeldKeys; } } -u32 sub_800A44C(void) +// Unused +static u32 GetBerryBlenderKeySendAttempts(void) { - return gUnknown_020223C0; + return gBerryBlenderKeySendAttempts; } -void sub_800A458(void) +// Unused +static void SendBerryBlenderNoSpaceForPokeblocks(void) { - BuildSendCmd(LINKCMD_0xAAAA); + BuildSendCmd(LINKCMD_BLENDER_NO_PBLOCK_SPACE); } u8 GetMultiplayerId(void) @@ -1752,7 +1754,7 @@ static void CB2_PrintErrorMessage(void) { if (gWirelessCommType == 1) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_PIN); gWirelessCommType = 0; @@ -1762,7 +1764,7 @@ static void CB2_PrintErrorMessage(void) } else if (gWirelessCommType == 2) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { rfu_REQ_stopMode(); rfu_waitREQComplete(); diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 3372aa766f..41b28ec5f3 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -876,8 +876,7 @@ static void sub_800F498(u16 *a0, u8 *a1) static bool32 RfuProcessEnqueuedRecvBlock(void) { - u8 i; - u8 j; + u8 i, j; u8 sp00[MAX_RFU_PLAYERS * (2 * (CMD_LENGTH - 1))]; u8 sp48[2 * (CMD_LENGTH - 1)]; u8 status; @@ -923,24 +922,25 @@ static bool32 RfuProcessEnqueuedRecvBlock(void) static void HandleSendFailure(u8 unused, u32 flags) { - s32 i, j; + s32 i, j, temp; const u8 *r10 = Rfu.sendBlock.payload; for (i = 0; i < Rfu.sendBlock.count; i++) { if (!(flags & 1)) { - sResendBlock16[0] = RFU_COMMAND_0x8900 | i; + sResendBlock16[0] = RFUCMD_0x8900 | i; for (j = 0; j < 7; j++) { - sResendBlock16[j + 1] = (r10[12 * i + (j << 1) + 1] << 8) | r10[12 * i + (j << 1) + 0]; + temp = j << 1; + sResendBlock16[j + 1] = (r10[i * 12 + temp + 1] << 8) | r10[i * 12 + temp]; } + for (j = 0; j < 7; j++) { - sResendBlock8[2 * j + 1] = sResendBlock16[j] >> 8; - sResendBlock8[2 * j + 0] = sResendBlock16[j]; - - j++;j--; // Needed to match; + temp = j << 1; + sResendBlock8[temp + 1] = sResendBlock16[j] >> 8; + sResendBlock8[temp + 0] = sResendBlock16[j] & 0xff; } RfuSendQueue_Enqueue(&Rfu.sendQueue, sResendBlock8); Rfu.sendBlock.failedFlags |= (1 << i); @@ -984,7 +984,7 @@ static void RfuFunc_SendKeysToRfu(void) { sHeldKeyCount++; gHeldKeyCodeToSend |= (sHeldKeyCount << 8); - RfuPrepareSendBuffer(RFU_COMMAND_0xBE00); + RfuPrepareSendBuffer(RFUCMD_SEND_HELD_KEYS); } } @@ -1008,41 +1008,40 @@ void ClearLinkRfuCallback(void) Rfu.callback = NULL; } -void sub_800F820(void) +static void Rfu_BerryBlenderSendHeldKeys(void) { - RfuPrepareSendBuffer(RFU_COMMAND_0x4400); + RfuPrepareSendBuffer(RFUCMD_BLENDER_SEND_KEYS); if (GetMultiplayerId() == 0) - gSendCmd[6] = GetBlenderArrowPosition(); - gUnknown_020223C0++; + gSendCmd[BLENDER_COMM_ARROW_POS] = GetBlenderArrowPosition(); + gBerryBlenderKeySendAttempts++; } -void sub_800F850(void) +void Rfu_SetBerryBlenderLinkCallback(void) { if (Rfu.callback == NULL) - Rfu.callback = sub_800F820; + Rfu.callback = Rfu_BerryBlenderSendHeldKeys; } static void RfuHandleReceiveCommand(u8 unused) { - u16 i; - u16 j; + u16 i, j; for (i = 0; i < MAX_RFU_PLAYERS; i++) { switch (gRecvCmds[i][0] & 0xff00) { - case RFU_COMMAND_0x7800: + case RFUCMD_0x7800: if (Rfu.parentChild == MODE_CHILD && gReceivedRemoteLinkPlayers) return; // fallthrough - case RFU_COMMAND_0x7700: + case RFUCMD_0x7700: if (gRfuLinkStatus->parentChild == MODE_CHILD) { Rfu.playerCount = gRecvCmds[i][1]; - Rfu.multiplayerId = sub_800F74C((u8 *)(gRecvCmds[i] + 2)); + Rfu.multiplayerId = sub_800F74C((u8 *)(&gRecvCmds[i][2])); } break; - case RFU_COMMAND_0x8800: + case RFUCMD_0x8800: if (Rfu.recvBlock[i].receiving == 0) { Rfu.recvBlock[i].next = 0; @@ -1053,7 +1052,7 @@ static void RfuHandleReceiveCommand(u8 unused) Rfu.blockReceived[i] = FALSE; } break; - case RFU_COMMAND_0x8900: + case RFUCMD_0x8900: if (Rfu.recvBlock[i].receiving == 1) { Rfu.recvBlock[i].next = gRecvCmds[i][0] & 0xff; @@ -1069,17 +1068,17 @@ static void RfuHandleReceiveCommand(u8 unused) } } break; - case RFU_COMMAND_SEND_BLOCK_REQ: + case RFUCMD_SEND_BLOCK_REQ: Rfu_InitBlockSend(sBlockRequests[gRecvCmds[i][1]].address, (u16)sBlockRequests[gRecvCmds[i][1]].size); break; - case RFU_COMMAND_READY_CLOSE_LINK: + case RFUCMD_READY_CLOSE_LINK: Rfu.readyCloseLink[i] = TRUE; break; - case RFU_COMMAND_READY_EXIT_STANDBY: + case RFUCMD_READY_EXIT_STANDBY: if (Rfu.unk_100 == gRecvCmds[i][1]) Rfu.readyExitStandby[i] = TRUE; break; - case RFU_COMMAND_0xED00: + case RFUCMD_0xED00: if (Rfu.parentChild == MODE_CHILD) { if (gReceivedRemoteLinkPlayers) @@ -1096,13 +1095,13 @@ static void RfuHandleReceiveCommand(u8 unused) } else { - RfuPrepareSendBuffer(RFU_COMMAND_0xEE00); + RfuPrepareSendBuffer(RFUCMD_0xEE00); gSendCmd[1] = gRecvCmds[i][1]; gSendCmd[2] = gRecvCmds[i][2]; gSendCmd[3] = gRecvCmds[i][3]; } break; - case RFU_COMMAND_0xEE00: + case RFUCMD_0xEE00: if (Rfu.parentChild == MODE_PARENT) { Rfu.unk_ce3 |= gRecvCmds[i][1]; @@ -1110,8 +1109,8 @@ static void RfuHandleReceiveCommand(u8 unused) ClearSelectedLinkPlayerIds(gRecvCmds[i][1]); } break; - case RFU_COMMAND_0x4400: - case RFU_COMMAND_0xBE00: + case RFUCMD_BLENDER_SEND_KEYS: + case RFUCMD_SEND_HELD_KEYS: gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; break; } @@ -1187,16 +1186,16 @@ static void RfuPrepareSendBuffer(u16 command) gSendCmd[0] = command; switch (command) { - case RFU_COMMAND_0x8800: + case RFUCMD_0x8800: gSendCmd[1] = Rfu.sendBlock.count; gSendCmd[2] = Rfu.sendBlock.owner + 0x80; break; - case RFU_COMMAND_SEND_BLOCK_REQ: + case RFUCMD_SEND_BLOCK_REQ: if (AreNoPlayersReceiving()) gSendCmd[1] = Rfu.blockRequestType; break; - case RFU_COMMAND_0x7700: - case RFU_COMMAND_0x7800: + case RFUCMD_0x7700: + case RFUCMD_0x7800: tmp = Rfu.unk_ce2 ^ Rfu.unk_ce3; Rfu.playerCount = sUnknown_082ED695[tmp] + 1; gSendCmd[1] = Rfu.playerCount; @@ -1204,44 +1203,43 @@ static void RfuPrepareSendBuffer(u16 command) for (i = 0; i < RFU_CHILD_MAX; i++) buff[i] = Rfu.linkPlayerIdx[i]; break; - case RFU_COMMAND_READY_EXIT_STANDBY: - case RFU_COMMAND_READY_CLOSE_LINK: + case RFUCMD_READY_EXIT_STANDBY: + case RFUCMD_READY_CLOSE_LINK: gSendCmd[1] = Rfu.unk_100; break; - case RFU_COMMAND_0x4400: + case RFUCMD_BLENDER_SEND_KEYS: gSendCmd[0] = command; gSendCmd[1] = gMain.heldKeys; break; - case RFU_COMMAND_0x2F00: - for (i = 0; i < 6; i++) - gSendCmd[1 + i] = Rfu.unk_f2[i]; + case RFUCMD_SEND_PACKET: + for (i = 0; i < RFU_PACKET_SIZE; i++) + gSendCmd[1 + i] = Rfu.packet[i]; break; - case RFU_COMMAND_0xBE00: + case RFUCMD_SEND_HELD_KEYS: gSendCmd[1] = gHeldKeyCodeToSend; break; - case RFU_COMMAND_0xEE00: + case RFUCMD_0xEE00: break; - case RFU_COMMAND_0xED00: + case RFUCMD_0xED00: break; } } -void sub_800FE50(void *a0) +void Rfu_SendPacket(void *data) { if (gSendCmd[0] == 0 && !RfuHasErrored()) { - memcpy(Rfu.unk_f2, a0, sizeof(Rfu.unk_f2)); - RfuPrepareSendBuffer(RFU_COMMAND_0x2F00); + memcpy(Rfu.packet, data, sizeof(Rfu.packet)); + RfuPrepareSendBuffer(RFUCMD_SEND_PACKET); } } bool32 Rfu_InitBlockSend(const u8 *src, size_t size) { bool8 r4; - if (Rfu.callback != NULL) - return FALSE; - if (gSendCmd[0] != 0) + if (Rfu.callback != NULL || gSendCmd[0] != 0) return FALSE; + if (Rfu.sendBlock.sending) { sRfuDebug.unk_83++; @@ -1260,7 +1258,7 @@ bool32 Rfu_InitBlockSend(const u8 *src, size_t size) memcpy(gBlockSendBuffer, src, size); Rfu.sendBlock.payload = gBlockSendBuffer; } - RfuPrepareSendBuffer(RFU_COMMAND_0x8800); + RfuPrepareSendBuffer(RFUCMD_0x8800); Rfu.callback = HandleBlockSend; Rfu.unk_5b = 0; return TRUE; @@ -1270,7 +1268,7 @@ static void HandleBlockSend(void) { if (gSendCmd[0] == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_0x8800); + RfuPrepareSendBuffer(RFUCMD_0x8800); if (Rfu.parentChild == MODE_PARENT) { if (++Rfu.unk_5b > 2) @@ -1278,7 +1276,7 @@ static void HandleBlockSend(void) } else { - if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == RFU_COMMAND_0x8800) + if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == RFUCMD_0x8800) Rfu.callback = SendNextBlock; } } @@ -1288,7 +1286,7 @@ static void SendNextBlock(void) { s32 i; const u8 *src = Rfu.sendBlock.payload; - gSendCmd[0] = RFU_COMMAND_0x8900 | Rfu.sendBlock.next; + gSendCmd[0] = RFUCMD_0x8900 | Rfu.sendBlock.next; for (i = 0; i < CMD_LENGTH - 1; i++) gSendCmd[i + 1] = (src[(i << 1) + Rfu.sendBlock.next * 12 + 1] << 8) | src[(i << 1) + Rfu.sendBlock.next * 12 + 0]; Rfu.sendBlock.next++; @@ -1306,7 +1304,7 @@ static void SendLastBlock(void) s32 i; if (Rfu.parentChild == MODE_CHILD) { - gSendCmd[0] = RFU_COMMAND_0x8900 | (Rfu.sendBlock.count - 1); + gSendCmd[0] = RFUCMD_0x8900 | (Rfu.sendBlock.count - 1); for (i = 0; i < CMD_LENGTH - 1; i++) gSendCmd[i + 1] = (src[(i << 1) + (Rfu.sendBlock.count - 1) * 12 + 1] << 8) | src[(i << 1) + (Rfu.sendBlock.count - 1) * 12 + 0]; if ((u8)gRecvCmds[mpId][0] == Rfu.sendBlock.count - 1) @@ -1327,7 +1325,7 @@ static void SendLastBlock(void) bool8 Rfu_SendBlockRequest(u8 type) { Rfu.blockRequestType = type; - RfuPrepareSendBuffer(RFU_COMMAND_SEND_BLOCK_REQ); + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_REQ); return TRUE; } @@ -1396,7 +1394,7 @@ static void SendReadyCloseLink(void) { if (gSendCmd[0] == 0 && Rfu.unk_ce8 == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_READY_CLOSE_LINK); + RfuPrepareSendBuffer(RFUCMD_READY_CLOSE_LINK); Rfu.callback = WaitAllReadyToCloseLink; } } @@ -1419,16 +1417,12 @@ void Rfu_SetCloseLinkCallback(void) static void SendReadyExitStandbyUntilAllReady(void) { - u8 playerCount; - u8 i; + u8 i, playerCount; - if (GetMultiplayerId() != 0) + if (GetMultiplayerId() != 0 && Rfu.recvQueue.count == 0 && Rfu.resendExitStandbyTimer > 60) { - if (Rfu.recvQueue.count == 0 && Rfu.resendExitStandbyTimer > 60) - { - RfuPrepareSendBuffer(RFU_COMMAND_READY_EXIT_STANDBY); - Rfu.resendExitStandbyTimer = 0; - } + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); + Rfu.resendExitStandbyTimer = 0; } playerCount = GetLinkPlayerCount(); for (i = 0; i < playerCount; i++) @@ -1450,7 +1444,7 @@ static void LinkLeaderReadyToExitStandby(void) { if (Rfu.recvQueue.count == 0 && gSendCmd[0] == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_READY_EXIT_STANDBY); + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); Rfu.callback = SendReadyExitStandbyUntilAllReady; } } @@ -1458,15 +1452,14 @@ static void LinkLeaderReadyToExitStandby(void) // RFU equivalent of LinkCB_Standby and LinkCB_StandbyForAll static void Rfu_LinkStandby(void) { - u8 i; - u8 playerCount; + u8 i, playerCount; if (GetMultiplayerId() != 0) { // Not link leader, send exit standby when ready if (Rfu.recvQueue.count == 0 && gSendCmd[0] == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_READY_EXIT_STANDBY); + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); Rfu.callback = SendReadyExitStandbyUntilAllReady; } } @@ -1483,7 +1476,7 @@ static void Rfu_LinkStandby(void) { if (Rfu.recvQueue.count == 0 && gSendCmd[0] == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_READY_EXIT_STANDBY); + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); Rfu.callback = LinkLeaderReadyToExitStandby; } } @@ -1555,28 +1548,28 @@ static bool8 CheckForLeavingGroupMembers(void) bool8 memberLeft = FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { - if (Rfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK - || Rfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO) + if (Rfu.partnerSendStatuses[i] == RFU_STATUS_JOIN_GROUP_OK + || Rfu.partnerSendStatuses[i] == RFU_STATUS_JOIN_GROUP_NO) { - if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS - || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) - { - if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_LEAVE_GROUP_NOTICE) - { - Rfu.partnerSendStatuses[i] = RFU_STATUS_LEAVE_GROUP; - Rfu.partnerRecvStatuses[i] = RFU_STATUS_10; - rfu_clearSlot(TYPE_NI_RECV, i); - rfu_NI_setSendData(1 << i, 8, &Rfu.partnerSendStatuses[i], 1); - memberLeft = TRUE; - } + continue; + } - } - else if (gRfuSlotStatusNI[Rfu.childSlot]->recv.state == SLOT_STATE_RECV_FAILED) + if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS + || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) + { + if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_LEAVE_GROUP_NOTICE) + { + Rfu.partnerSendStatuses[i] = RFU_STATUS_LEAVE_GROUP; + Rfu.partnerRecvStatuses[i] = RFU_STATUS_10; rfu_clearSlot(TYPE_NI_RECV, i); - { - + rfu_NI_setSendData(1 << i, 8, &Rfu.partnerSendStatuses[i], 1); + memberLeft = TRUE; } } + else if (gRfuSlotStatusNI[Rfu.childSlot]->recv.state == SLOT_STATE_RECV_FAILED) + { + rfu_clearSlot(TYPE_NI_RECV, i); + } } return memberLeft; } @@ -1706,9 +1699,9 @@ static void sub_801084C(u8 taskId) if (Rfu.parentChild == MODE_PARENT) { if (gReceivedRemoteLinkPlayers) - RfuPrepareSendBuffer(RFU_COMMAND_0x7800); + RfuPrepareSendBuffer(RFUCMD_0x7800); else - RfuPrepareSendBuffer(RFU_COMMAND_0x7700); + RfuPrepareSendBuffer(RFUCMD_0x7700); gTasks[taskId].data[0] = 101; } else @@ -1728,7 +1721,7 @@ static void sub_801084C(u8 taskId) if (AreNoPlayersReceiving()) { Rfu.blockRequestType = 0; - RfuPrepareSendBuffer(RFU_COMMAND_SEND_BLOCK_REQ); + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_REQ); gTasks[taskId].data[0]++; } } @@ -1818,7 +1811,7 @@ static void Task_ExchangeLinkPlayers(u8 taskId) if (gSendCmd[0] == 0) { ResetBlockReceivedFlag(r4); - RfuPrepareSendBuffer(RFU_COMMAND_0x7800); + RfuPrepareSendBuffer(RFUCMD_0x7800); gTasks[taskId].data[0]++; } break; @@ -2051,8 +2044,7 @@ void sub_80110B8(u32 a0) if ((r8 >> i) & 1) { child_sprite_genders |= ((0x80 | ((gLinkPlayers[Rfu.linkPlayerIdx[i]].gender & 1) << 3) | (gLinkPlayers[Rfu.linkPlayerIdx[i]].trainerId & 7)) << (numConnectedChildren << 3)); - numConnectedChildren++; - if (numConnectedChildren == a0 - 1) + if (++numConnectedChildren == a0 - 1) break; } } @@ -2097,8 +2089,7 @@ static void sub_80111FC(void) static void sub_801120C(u8 msg, u8 paramCount) { - u8 i; - u8 disconnectFlag = 0; + u8 i, disconnectFlag = 0; switch (msg) { case LMAN_MSG_INITIALIZE_COMPLETED: @@ -2632,7 +2623,7 @@ static void sub_8011E2C(u8 taskId) { if (gSendCmd[0] == 0 && Rfu.unk_ce8 == 0) { - RfuPrepareSendBuffer(RFU_COMMAND_0xED00); + RfuPrepareSendBuffer(RFUCMD_0xED00); gSendCmd[1] = gTasks[taskId].data[0]; gSendCmd[2] = gTasks[taskId].data[1]; Rfu.playerCount -= sUnknown_082ED695[gTasks[taskId].data[0]]; diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index c4c000a6e2..821b2d1185 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -309,8 +309,7 @@ static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = { void RfuRecvQueue_Reset(struct RfuRecvQueue *queue) { - s32 i; - s32 j; + s32 i, j; for (i = 0; i < RECV_QUEUE_NUM_SLOTS; i++) { @@ -327,8 +326,7 @@ void RfuRecvQueue_Reset(struct RfuRecvQueue *queue) void RfuSendQueue_Reset(struct RfuSendQueue *queue) { - s32 i; - s32 j; + s32 i, j; for (i = 0; i < SEND_QUEUE_NUM_SLOTS; i++) { @@ -345,8 +343,7 @@ void RfuSendQueue_Reset(struct RfuSendQueue *queue) static void RfuUnusedQueue_Reset(struct RfuUnusedQueue *queue) { - s32 i; - s32 j; + s32 i, j; for (i = 0; i < UNUSED_QUEUE_NUM_SLOTS; i++) { @@ -631,7 +628,7 @@ static u8 GetConnectedChildStrength(u8 maxFlags) if (gRfuLinkStatus->parentChild == MODE_PARENT) { - for (i = 0; i < 4; i++) + for (i = 0; i < RFU_CHILD_MAX; i++) { if (flags & 1) { @@ -925,8 +922,7 @@ void RecordMixTrainerNames(void) { if (gWirelessCommType != 0) { - s32 i; - s32 j; + s32 i, j; s32 nextSpace; s32 connectedTrainerRecordIndices[5]; struct TrainerNameRecord *newRecords = calloc(ARRAY_COUNT(gSaveBlock1Ptr->trainerNameRecords), sizeof(struct TrainerNameRecord)); diff --git a/src/list_menu.c b/src/list_menu.c index ef55f58723..7784dd338b 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -312,7 +312,7 @@ static void ListMenuDummyTask(u8 taskId) } -s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum) +u32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum) { switch (sMysteryGiftLinkMenu.state) { @@ -335,11 +335,11 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str break; case 1: sMysteryGiftLinkMenu.currItemId = ListMenu_ProcessInput(sMysteryGiftLinkMenu.listTaskId); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { sMysteryGiftLinkMenu.state = 2; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { sMysteryGiftLinkMenu.currItemId = LIST_CANCEL; sMysteryGiftLinkMenu.state = 2; @@ -410,20 +410,20 @@ s32 ListMenu_ProcessInput(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { return list->template.items[list->scrollOffset + list->selectedRow].id; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return LIST_CANCEL; } - else if (gMain.newAndRepeatedKeys & DPAD_UP) + else if (JOY_REPEAT(DPAD_UP)) { ListMenuChangeSelection(list, TRUE, 1, FALSE); return LIST_NOTHING_CHOSEN; } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { ListMenuChangeSelection(list, TRUE, 1, TRUE); return LIST_NOTHING_CHOSEN; @@ -439,12 +439,12 @@ s32 ListMenu_ProcessInput(u8 listTaskId) rightButton = FALSE; break; case LIST_MULTIPLE_SCROLL_DPAD: - leftButton = gMain.newAndRepeatedKeys & DPAD_LEFT; - rightButton = gMain.newAndRepeatedKeys & DPAD_RIGHT; + leftButton = JOY_REPEAT(DPAD_LEFT); + rightButton = JOY_REPEAT(DPAD_RIGHT); break; case LIST_MULTIPLE_SCROLL_L_R: - leftButton = gMain.newAndRepeatedKeys & L_BUTTON; - rightButton = gMain.newAndRepeatedKeys & R_BUTTON; + leftButton = JOY_REPEAT(L_BUTTON); + rightButton = JOY_REPEAT(R_BUTTON); break; } diff --git a/src/m4a.c b/src/m4a.c index 11a4525eab..b8f9e21c11 100644 --- a/src/m4a.c +++ b/src/m4a.c @@ -22,8 +22,7 @@ u8 gMPlayMemAccArea[0x10]; u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) { - u32 val1; - u32 val2; + u32 val1, val2; u32 fineAdjustShifted = fineAdjust << 24; if (key > 178) @@ -315,7 +314,7 @@ void MPlayExtender(struct CgbChannel *cgbChans) void MusicPlayerJumpTableCopy(void) { - asm("swi 0x2A"); + asm("svc 0x2A"); } void ClearChain(void *x) @@ -352,25 +351,25 @@ void SoundInit(struct SoundInfo *soundInfo) | SOUND_ALL_MIX_FULL; REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40; - REG_DMA1SAD = (s32)soundInfo->pcmBuffer; - REG_DMA1DAD = (s32)®_FIFO_A; - REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; - REG_DMA2DAD = (s32)®_FIFO_B; + REG_DMA1SAD = (u32)soundInfo->pcmBuffer; + REG_DMA1DAD = (u32)®_FIFO_A; + REG_DMA2SAD = (u32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; + REG_DMA2DAD = (u32)®_FIFO_B; SOUND_INFO_PTR = soundInfo; CpuFill32(0, soundInfo, sizeof(struct SoundInfo)); soundInfo->maxChans = 8; soundInfo->masterVolume = 15; - soundInfo->plynote = (u32)ply_note; + soundInfo->plynote = ply_note; soundInfo->CgbSound = DummyFunc; soundInfo->CgbOscOff = (void (*)(u8))DummyFunc; soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc; - soundInfo->ExtVolPit = (u32)DummyFunc; + soundInfo->ExtVolPit = (void (*)(struct MusicPlayerInfo *, struct MusicPlayerTrack *))DummyFunc; MPlayJumpTableCopy(gMPlayJumpTable); - soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable; + soundInfo->MPlayJumpTable = (void (**)())gMPlayJumpTable; SampleFreqSet(SOUND_MODE_FREQ_13379); @@ -381,7 +380,7 @@ void SampleFreqSet(u32 freq) { struct SoundInfo *soundInfo = SOUND_INFO_PTR; - freq = (freq & 0xF0000) >> 16; + freq = (freq & SOUND_MODE_FREQ) >> SOUND_MODE_FREQ_SHIFT; soundInfo->freq = freq; soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1]; soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank; @@ -432,14 +431,9 @@ void m4aSoundMode(u32 mode) soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT; - temp = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - - while (temp != 0) + for (temp = MAX_DIRECTSOUND_CHANNELS, chan = soundInfo->chans; temp != 0; temp--,chan++) { chan->status = 0; - temp--; - chan++; } } @@ -469,37 +463,28 @@ void m4aSoundMode(u32 mode) void SoundClear(void) { - struct SoundInfo *soundInfo = SOUND_INFO_PTR; s32 i; - void *chan; + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + struct SoundChannel *chan; if (soundInfo->ident != ID_NUMBER) return; soundInfo->ident++; - i = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - - while (i > 0) + for (i = MAX_DIRECTSOUND_CHANNELS, chan = soundInfo->chans; i > 0; i--,chan++) { - ((struct SoundChannel *)chan)->status = 0; - i--; - chan = (void *)((s32)chan + sizeof(struct SoundChannel)); + chan->status = 0; } - chan = soundInfo->cgbChans; + chan = (struct SoundChannel *)soundInfo->cgbChans; if (chan) { - i = 1; - - while (i <= 4) + for (i=1; i<=4; i++,chan++) { soundInfo->CgbOscOff(i); - ((struct CgbChannel *)chan)->sf = 0; - i++; - chan = (void *)((s32)chan + sizeof(struct CgbChannel)); + chan->status = 0; } } @@ -510,21 +495,20 @@ void m4aSoundVSyncOff(void) { struct SoundInfo *soundInfo = SOUND_INFO_PTR; - if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) - { - soundInfo->ident += 10; + if (soundInfo->ident < ID_NUMBER || soundInfo->ident > ID_NUMBER + 1) + return; + soundInfo->ident += 10; - if (REG_DMA1CNT & (DMA_REPEAT << 16)) - REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + if (REG_DMA1CNT & (DMA_REPEAT << 16)) + REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - if (REG_DMA2CNT & (DMA_REPEAT << 16)) - REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + if (REG_DMA2CNT & (DMA_REPEAT << 16)) + REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - REG_DMA1CNT_H = DMA_32BIT; - REG_DMA2CNT_H = DMA_32BIT; + REG_DMA1CNT_H = DMA_32BIT; + REG_DMA2CNT_H = DMA_32BIT; - CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); - } + CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); } void m4aSoundVSyncOn(void) @@ -580,7 +564,7 @@ void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track } soundInfo->intp = (u32)mplayInfo; - soundInfo->func = (u32)MPlayMain; + soundInfo->func = MPlayMain; soundInfo->ident = ID_NUMBER; mplayInfo->ident = ID_NUMBER; } @@ -614,28 +598,21 @@ void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader mplayInfo->tempoC = 0; mplayInfo->fadeOI = 0; - i = 0; - track = mplayInfo->tracks; - - while (i < songHeader->trackCount && i < mplayInfo->trackCount) + for (i = 0, track = mplayInfo->tracks; i < songHeader->trackCount && i < mplayInfo->trackCount; i++, track++) { TrackStop(mplayInfo, track); track->flags = MPT_FLG_EXIST | MPT_FLG_START; track->chan = 0; track->cmdPtr = songHeader->part[i]; - i++; - track++; } - while (i < mplayInfo->trackCount) + for (; i < mplayInfo->trackCount; i++, track++) { TrackStop(mplayInfo, track); track->flags = 0; - i++; - track++; } - if (songHeader->reverb & 0x80) + if (songHeader->reverb & SOUND_MODE_REVERB_SET) m4aSoundMode(songHeader->reverb); mplayInfo->ident = ID_NUMBER; @@ -653,14 +630,9 @@ void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo) mplayInfo->ident++; mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { TrackStop(mplayInfo, track); - i--; - track++; } mplayInfo->ident = ID_NUMBER; @@ -704,10 +676,8 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) if ((s16)(mplayInfo->fadeOV & mask) <= 0) { - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { u32 val; @@ -719,9 +689,6 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) if (!val) track->flags = 0; - - i--; - track++; } if (mplayInfo->fadeOV & TEMPORARY_FADE) @@ -734,10 +701,7 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) } } - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { if (track->flags & MPT_FLG_EXIST) { @@ -746,9 +710,6 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) track->volX = (fadeOV >> FADE_VOL_SHIFT); track->flags |= MPT_FLG_VOLCHG; } - - i--; - track++; } } @@ -756,7 +717,7 @@ void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tr { if (track->flags & MPT_FLG_VOLSET) { - s32 x; + u32 x; s32 y; x = (u32)(track->vol * track->volX) >> 5; diff --git a/src/m4a_1.s b/src/m4a_1.s index cab4ed1748..eace09b05f 100644 --- a/src/m4a_1.s +++ b/src/m4a_1.s @@ -22,13 +22,13 @@ SoundMain: ldr r0, lt_SOUND_INFO_PTR ldr r0, [r0] ldr r2, lt_ID_NUMBER - ldr r3, [r0, o_SoundInfo_ident] + ldr r3, [r0, #o_SoundInfo_ident] cmp r2, r3 beq SoundMain_1 bx lr @ Exit the function if ident doesn't match ID_NUMBER. SoundMain_1: adds r3, 1 - str r3, [r0, o_SoundInfo_ident] + str r3, [r0, #o_SoundInfo_ident] push {r4-r7,lr} mov r1, r8 mov r2, r9 @@ -36,7 +36,7 @@ SoundMain_1: mov r4, r11 push {r0-r4} sub sp, 0x18 - ldrb r1, [r0, o_SoundInfo_maxLines] + ldrb r1, [r0, #o_SoundInfo_maxLines] cmp r1, 0 @ if maxLines is 0, there is no maximum beq SoundMain_3 ldr r2, lt_REG_VCOUNT @@ -48,24 +48,24 @@ SoundMain_2: adds r1, r2 SoundMain_3: str r1, [sp, 0x14] - ldr r3, [r0, o_SoundInfo_func] + ldr r3, [r0, #o_SoundInfo_func] cmp r3, 0 beq SoundMain_4 - ldr r0, [r0, o_SoundInfo_intp] + ldr r0, [r0, #o_SoundInfo_intp] bl _081DD25E ldr r0, [sp, 0x18] SoundMain_4: - ldr r3, [r0, o_SoundInfo_CgbSound] + ldr r3, [r0, #o_SoundInfo_CgbSound] bl _081DD25E ldr r0, [sp, 0x18] - ldr r3, [r0, o_SoundInfo_pcmSamplesPerVBlank] + ldr r3, [r0, #o_SoundInfo_pcmSamplesPerVBlank] mov r8, r3 ldr r5, lt_o_SoundInfo_pcmBuffer adds r5, r0 - ldrb r4, [r0, o_SoundInfo_pcmDmaCounter] + ldrb r4, [r0, #o_SoundInfo_pcmDmaCounter] subs r7, r4, 1 bls SoundMain_5 - ldrb r1, [r0, o_SoundInfo_pcmDmaPeriod] + ldrb r1, [r0, #o_SoundInfo_pcmDmaPeriod] subs r1, r7 mov r2, r8 muls r2, r1 @@ -87,7 +87,7 @@ lt_PCM_DMA_BUF_SIZE: .word PCM_DMA_BUF_SIZE thumb_func_start SoundMainRAM SoundMainRAM: - ldrb r3, [r0, o_SoundInfo_reverb] + ldrb r3, [r0, #o_SoundInfo_reverb] cmp r3, 0 beq SoundMainRAM_NoReverb adr r1, SoundMainRAM_Reverb @@ -95,7 +95,7 @@ SoundMainRAM: .arm SoundMainRAM_Reverb: cmp r4, 0x2 - addeq r7, r0, o_SoundInfo_pcmBuffer + addeq r7, r0, #o_SoundInfo_pcmBuffer addne r7, r5, r8 mov r4, r8 _081DCEC4: @@ -145,14 +145,14 @@ SoundMainRAM_NoReverb_Loop: bgt SoundMainRAM_NoReverb_Loop _081DCF36: ldr r4, [sp, 0x18] - ldr r0, [r4, o_SoundInfo_divFreq] + ldr r0, [r4, #o_SoundInfo_divFreq] mov r12, r0 - ldrb r0, [r4, o_SoundInfo_maxChans] - adds r4, o_SoundInfo_chans + ldrb r0, [r4, #o_SoundInfo_maxChans] + adds r4, #o_SoundInfo_chans SoundMainRAM_ChanLoop: str r0, [sp, 0x4] - ldr r3, [r4, o_SoundChannel_wav] + ldr r3, [r4, #o_SoundChannel_wav] ldr r0, [sp, 0x14] cmp r0, 0 beq _081DCF60 @@ -169,7 +169,7 @@ _081DCF54: .pool _081DCF60: - ldrb r6, [r4, o_SoundChannel_status] + ldrb r6, [r4, #o_SoundChannel_status] movs r0, 0xC7 tst r0, r6 bne _081DCF6A @@ -182,99 +182,99 @@ _081DCF6A: tst r0, r6 bne _081DCFB0 movs r6, 0x3 - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] adds r0, r3, 0 adds r0, 0x10 - ldr r1, [r4, o_SoundChannel_ct] + ldr r1, [r4, #o_SoundChannel_ct] adds r0, r1 - str r0, [r4, o_SoundChannel_cp] + str r0, [r4, #o_SoundChannel_cp] ldr r0, [r3, 0xC] subs r0, r1 - str r0, [r4, o_SoundChannel_ct] + str r0, [r4, #o_SoundChannel_ct] movs r5, 0 - strb r5, [r4, o_SoundChannel_ev] - str r5, [r4, o_SoundChannel_fw] + strb r5, [r4, #o_SoundChannel_ev] + str r5, [r4, #o_SoundChannel_fw] ldrb r2, [r3, 0x3] movs r0, 0xC0 tst r0, r2 beq _081DCFF8 movs r0, 0x10 orrs r6, r0 - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] b _081DCFF8 _081DCFA0: - ldrb r5, [r4, o_SoundChannel_ev] + ldrb r5, [r4, #o_SoundChannel_ev] movs r0, 0x4 tst r0, r6 beq _081DCFB6 - ldrb r0, [r4, o_SoundChannel_iel] + ldrb r0, [r4, #o_SoundChannel_iel] subs r0, 1 - strb r0, [r4, o_SoundChannel_iel] + strb r0, [r4, #o_SoundChannel_iel] bhi _081DD006 _081DCFB0: movs r0, 0 - strb r0, [r4, o_SoundChannel_status] + strb r0, [r4, #o_SoundChannel_status] b _081DD240 _081DCFB6: movs r0, 0x40 tst r0, r6 beq _081DCFD6 - ldrb r0, [r4, o_SoundChannel_release] + ldrb r0, [r4, #o_SoundChannel_release] muls r5, r0 lsrs r5, 8 - ldrb r0, [r4, o_SoundChannel_iev] + ldrb r0, [r4, #o_SoundChannel_iev] cmp r5, r0 bhi _081DD006 _081DCFC8: - ldrb r5, [r4, o_SoundChannel_iev] + ldrb r5, [r4, #o_SoundChannel_iev] cmp r5, 0 beq _081DCFB0 movs r0, 0x4 orrs r6, r0 - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] b _081DD006 _081DCFD6: movs r2, 0x3 ands r2, r6 cmp r2, 0x2 bne _081DCFF4 - ldrb r0, [r4, o_SoundChannel_decay] + ldrb r0, [r4, #o_SoundChannel_decay] muls r5, r0 lsrs r5, 8 - ldrb r0, [r4, o_SoundChannel_sustain] + ldrb r0, [r4, #o_SoundChannel_sustain] cmp r5, r0 bhi _081DD006 adds r5, r0, 0 beq _081DCFC8 subs r6, 0x1 - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] b _081DD006 _081DCFF4: cmp r2, 0x3 bne _081DD006 _081DCFF8: - ldrb r0, [r4, o_SoundChannel_attack] + ldrb r0, [r4, #o_SoundChannel_attack] adds r5, r0 cmp r5, 0xFF bcc _081DD006 movs r5, 0xFF subs r6, 0x1 - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] _081DD006: - strb r5, [r4, o_SoundChannel_ev] + strb r5, [r4, #o_SoundChannel_ev] ldr r0, [sp, 0x18] - ldrb r0, [r0, o_SoundChannel_release] + ldrb r0, [r0, #o_SoundChannel_release] adds r0, 0x1 muls r0, r5 lsrs r5, r0, 4 - ldrb r0, [r4, o_SoundChannel_rightVolume] + ldrb r0, [r4, #o_SoundChannel_rightVolume] muls r0, r5 lsrs r0, 8 - strb r0, [r4, o_SoundChannel_er] - ldrb r0, [r4, o_SoundChannel_leftVolume] + strb r0, [r4, #o_SoundChannel_er] + ldrb r0, [r4, #o_SoundChannel_leftVolume] muls r0, r5 lsrs r0, 8 - strb r0, [r4, o_SoundChannel_el] + strb r0, [r4, #o_SoundChannel_el] movs r0, 0x10 ands r0, r6 str r0, [sp, 0x10] @@ -289,17 +289,17 @@ _081DD006: str r0, [sp, 0x10] _081DD03A: ldr r5, [sp, 0x8] - ldr r2, [r4, o_SoundChannel_ct] - ldr r3, [r4, o_SoundChannel_cp] + ldr r2, [r4, #o_SoundChannel_ct] + ldr r3, [r4, #o_SoundChannel_cp] adr r0, _081DD044 bx r0 .arm _081DD044: str r8, [sp] - ldr r9, [r4, o_SoundChannel_fw] - ldrb r10, [r4, o_SoundChannel_er] - ldrb r11, [r4, o_SoundChannel_el] - ldrb r0, [r4, o_SoundChannel_type] + ldr r9, [r4, #o_SoundChannel_fw] + ldrb r10, [r4, #o_SoundChannel_er] + ldrb r11, [r4, #o_SoundChannel_el] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x30 beq _081DD068 bl sub_82DF49C @@ -307,7 +307,7 @@ _081DD044: _081DD068: mov r10, r10, lsl 16 mov r11, r11, lsl 16 - ldrb r0, [r4, o_SoundChannel_type] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x8 beq _081DD19C _081DD07C: @@ -383,7 +383,7 @@ _081DD164: ldrne r3, [sp, 0xC] bne _081DD118 _081DD174: - strb r2, [r4, o_SoundChannel_status] + strb r2, [r4, #o_SoundChannel_status] mov r0, r5, lsr 30 bic r5, r5, 0xC0000000 rsb r0, r0, 0x3 @@ -395,7 +395,7 @@ _081DD174: b _081DD234 _081DD19C: push {r4,r12} - ldr r1, [r4, o_SoundChannel_freq] + ldr r1, [r4, #o_SoundChannel_freq] mul r4, r12, r1 ldrsb r0, [r3] ldrsb r1, [r3, 0x1]! @@ -434,10 +434,10 @@ _081DD208: sub r3, r3, 0x1 pop {r4,r12} _081DD228: - str r9, [r4, o_SoundChannel_fw] + str r9, [r4, #o_SoundChannel_fw] _081DD22C: - str r2, [r4, o_SoundChannel_ct] - str r3, [r4, o_SoundChannel_cp] + str r2, [r4, #o_SoundChannel_ct] + str r3, [r4, #o_SoundChannel_cp] _081DD234: ldr r8, [sp] add r0, pc, 0x1 @@ -467,33 +467,33 @@ _081DD25E: arm_func_start sub_82DF49C sub_82DF49C: - ldr r6, [r4, o_SoundChannel_wav] - ldrb r0, [r4, o_SoundChannel_status] + ldr r6, [r4, #o_SoundChannel_wav] + ldrb r0, [r4, #o_SoundChannel_status] tst r0, 0x20 bne _081DD2B4 orr r0, r0, 0x20 - strb r0, [r4, o_SoundChannel_status] - ldrb r0, [r4, o_SoundChannel_type] + strb r0, [r4, #o_SoundChannel_status] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x10 beq _081DD29C ldr r1, [r6, 0xC] add r1, r1, r6, lsl 1 add r1, r1, 0x20 sub r3, r1, r3 - str r3, [r4, o_SoundChannel_cp] + str r3, [r4, #o_SoundChannel_cp] _081DD29C: ldrh r0, [r6] cmp r0, 0 beq _081DD2B4 sub r3, r3, r6 sub r3, r3, 0x10 - str r3, [r4, o_SoundChannel_cp] + str r3, [r4, #o_SoundChannel_cp] _081DD2B4: push {r8,r12,lr} mov r10, r10, lsl 16 mov r11, r11, lsl 16 - ldr r1, [r4, o_SoundChannel_freq] - ldrb r0, [r4, o_SoundChannel_type] + ldr r1, [r4, #o_SoundChannel_freq] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x8 movne r8, 0x800000 muleq r8, r12, r1 @@ -501,8 +501,8 @@ _081DD2B4: cmp r0, 0 beq _081DD468 mov r0, 0xFF000000 - str r0, [r4, o_SoundChannel_xpi] - ldrb r0, [r4, o_SoundChannel_type] + str r0, [r4, #o_SoundChannel_xpi] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x10 bne _081DD3C0 bl sub_82DF758 @@ -555,7 +555,7 @@ _081DD398: ldr r0, [sp, 0x1C] cmp r0, 0 beq _081DD4F4 - ldr r3, [r4, o_SoundChannel_wav] + ldr r3, [r4, #o_SoundChannel_wav] ldr r3, [r3, 0x8] rsb lr, r2, 0 _081DD3B0: @@ -612,7 +612,7 @@ _081DD440: add r3, r3, 0x2 b _081DD4F0 _081DD468: - ldrb r0, [r4, o_SoundChannel_type] + ldrb r0, [r4, #o_SoundChannel_type] tst r0, 0x10 beq _081DD4F0 ldrsb r0, [r3, -0x1]! @@ -653,7 +653,7 @@ _081DD4F0: pop {r8,r12,pc} _081DD4F4: mov r2, 0 - strb r2, [r4, o_SoundChannel_status] + strb r2, [r4, #o_SoundChannel_status] mov r0, r5, lsr 30 bic r5, r5, 0xC0000000 rsb r0, r0, 0x3 @@ -669,13 +669,13 @@ _081DD4F4: sub_82DF758: push {r0,r2,r5-r7,lr} mov r0, r3, lsr 6 - ldr r1, [r4, o_SoundChannel_xpi] + ldr r1, [r4, #o_SoundChannel_xpi] cmp r0, r1 beq _081DD594 - str r0, [r4, o_SoundChannel_xpi] + str r0, [r4, #o_SoundChannel_xpi] mov r1, 0x21 mul r2, r1, r0 - ldr r1, [r4, o_SoundChannel_wav] + ldr r1, [r4, #o_SoundChannel_wav] add r2, r2, r1 add r2, r2, 0x10 ldr r5, =gUnknown_03001300 @@ -749,7 +749,7 @@ _081DD5E2: ply_fine: push {r4,r5,lr} adds r5, r1, 0 - ldr r4, [r5, o_MusicPlayerTrack_chan] + ldr r4, [r5, #o_MusicPlayerTrack_chan] cmp r4, 0 beq ply_fine_done ply_fine_loop: @@ -830,7 +830,7 @@ _081DD64A: ply_goto: push {lr} ply_goto_1: - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r0, [r2, 0x3] lsls r0, 8 ldrb r3, [r2, 0x2] @@ -841,24 +841,24 @@ ply_goto_1: lsls r0, 8 bl ldrb_r3_r2 orrs r0, r3 - str r0, [r1, o_MusicPlayerTrack_cmdPtr] + str r0, [r1, #o_MusicPlayerTrack_cmdPtr] pop {r0} bx r0 thumb_func_end ply_goto thumb_func_start ply_patt ply_patt: - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + ldrb r2, [r1, #o_MusicPlayerTrack_patternLevel] cmp r2, 3 bhs ply_patt_done lsls r2, 2 adds r3, r1, r2 - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] adds r2, 0x4 - str r2, [r3, o_MusicPlayerTrack_patternStack] - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + str r2, [r3, #o_MusicPlayerTrack_patternStack] + ldrb r2, [r1, #o_MusicPlayerTrack_patternLevel] adds r2, 1 - strb r2, [r1, o_MusicPlayerTrack_patternLevel] + strb r2, [r1, #o_MusicPlayerTrack_patternLevel] b ply_goto ply_patt_done: b ply_fine @@ -866,15 +866,15 @@ ply_patt_done: thumb_func_start ply_pend ply_pend: - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + ldrb r2, [r1, #o_MusicPlayerTrack_patternLevel] cmp r2, 0 beq ply_pend_done subs r2, 1 - strb r2, [r1, o_MusicPlayerTrack_patternLevel] + strb r2, [r1, #o_MusicPlayerTrack_patternLevel] lsls r2, 2 adds r3, r1, r2 - ldr r2, [r3, o_MusicPlayerTrack_patternStack] - str r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r3, #o_MusicPlayerTrack_patternStack] + str r2, [r1, #o_MusicPlayerTrack_cmdPtr] ply_pend_done: bx lr thumb_func_end ply_pend @@ -882,17 +882,17 @@ ply_pend_done: thumb_func_start ply_rept ply_rept: push {lr} - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r3, [r2] cmp r3, 0 bne ply_rept_1 adds r2, 1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] + str r2, [r1, #o_MusicPlayerTrack_cmdPtr] b ply_goto_1 ply_rept_1: - ldrb r3, [r1, o_MusicPlayerTrack_repN] + ldrb r3, [r1, #o_MusicPlayerTrack_repN] adds r3, 1 - strb r3, [r1, o_MusicPlayerTrack_repN] + strb r3, [r1, #o_MusicPlayerTrack_repN] mov r12, r3 bl ld_r3_tp_adr_i cmp r12, r3 @@ -900,9 +900,9 @@ ply_rept_1: b ply_goto_1 ply_rept_2: movs r3, 0 - strb r3, [r1, o_MusicPlayerTrack_repN] + strb r3, [r1, #o_MusicPlayerTrack_repN] adds r2, 5 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] + str r2, [r1, #o_MusicPlayerTrack_cmdPtr] pop {r0} bx r0 thumb_func_end ply_rept @@ -911,7 +911,7 @@ ply_rept_2: ply_prio: mov r12, lr bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_priority] + strb r3, [r1, #o_MusicPlayerTrack_priority] bx r12 thumb_func_end ply_prio @@ -920,11 +920,11 @@ ply_tempo: mov r12, lr bl ld_r3_tp_adr_i lsls r3, 1 - strh r3, [r0, o_MusicPlayerInfo_tempoD] - ldrh r2, [r0, o_MusicPlayerInfo_tempoU] + strh r3, [r0, #o_MusicPlayerInfo_tempoD] + ldrh r2, [r0, #o_MusicPlayerInfo_tempoU] muls r3, r2 lsrs r3, 8 - strh r3, [r0, o_MusicPlayerInfo_tempoI] + strh r3, [r0, #o_MusicPlayerInfo_tempoI] bx r12 thumb_func_end ply_tempo @@ -932,35 +932,35 @@ ply_tempo: ply_keysh: mov r12, lr bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_keyShift] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_keyShift] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0xC orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_keysh thumb_func_start ply_voice ply_voice: mov r12, lr - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r3, [r2] adds r2, 1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] + str r2, [r1, #o_MusicPlayerTrack_cmdPtr] lsls r2, r3, 1 adds r2, r3 lsls r2, 2 - ldr r3, [r0, o_MusicPlayerInfo_tone] + ldr r3, [r0, #o_MusicPlayerInfo_tone] adds r2, r3 ldr r3, [r2] bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_type] + str r3, [r1, #o_MusicPlayerTrack_ToneData_type] ldr r3, [r2, 0x4] bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_wav] + str r3, [r1, #o_MusicPlayerTrack_ToneData_wav] ldr r3, [r2, 0x8] bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_attack] + str r3, [r1, #o_MusicPlayerTrack_ToneData_attack] bx r12 thumb_func_end ply_voice @@ -968,11 +968,11 @@ ply_voice: ply_vol: mov r12, lr bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_vol] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_vol] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0x3 orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_vol @@ -981,11 +981,11 @@ ply_pan: mov r12, lr bl ld_r3_tp_adr_i subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_pan] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_pan] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0x3 orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_pan @@ -994,11 +994,11 @@ ply_bend: mov r12, lr bl ld_r3_tp_adr_i subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_bend] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_bend] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0xC orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_bend @@ -1006,11 +1006,11 @@ ply_bend: ply_bendr: mov r12, lr bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_bendRange] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_bendRange] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0xC orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_bendr @@ -1018,7 +1018,7 @@ ply_bendr: ply_lfodl: mov r12, lr bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_lfoDelay] + strb r3, [r1, #o_MusicPlayerTrack_lfoDelay] bx r12 thumb_func_end ply_lfodl @@ -1026,14 +1026,14 @@ ply_lfodl: ply_modt: mov r12, lr bl ld_r3_tp_adr_i - ldrb r0, [r1, o_MusicPlayerTrack_modT] + ldrb r0, [r1, #o_MusicPlayerTrack_modT] cmp r0, r3 beq _081DD7AA - strb r3, [r1, o_MusicPlayerTrack_modT] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_modT] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0xF orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] _081DD7AA: bx r12 thumb_func_end ply_modt @@ -1043,18 +1043,18 @@ ply_tune: mov r12, lr bl ld_r3_tp_adr_i subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_tune] - ldrb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_tune] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] movs r2, 0xC orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx r12 thumb_func_end ply_tune thumb_func_start ply_port ply_port: mov r12, lr - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r3, [r2] adds r2, 1 ldr r0, =REG_SOUND1CNT_L @ sound register base address @@ -1072,20 +1072,20 @@ m4aSoundVSync: @ Exit the function if ident is not ID_NUMBER or ID_NUMBER+1. ldr r2, lt2_ID_NUMBER - ldr r3, [r0, o_SoundInfo_ident] + ldr r3, [r0, #o_SoundInfo_ident] subs r3, r2 cmp r3, 1 bhi m4aSoundVSync_Done @ Decrement the PCM DMA counter. If it reaches 0, we need to do a DMA. - ldrb r1, [r0, o_SoundInfo_pcmDmaCounter] + ldrb r1, [r0, #o_SoundInfo_pcmDmaCounter] subs r1, 1 - strb r1, [r0, o_SoundInfo_pcmDmaCounter] + strb r1, [r0, #o_SoundInfo_pcmDmaCounter] bgt m4aSoundVSync_Done @ Reload the PCM DMA counter. - ldrb r1, [r0, o_SoundInfo_pcmDmaPeriod] - strb r1, [r0, o_SoundInfo_pcmDmaCounter] + ldrb r1, [r0, #o_SoundInfo_pcmDmaPeriod] + strb r1, [r0, #o_SoundInfo_pcmDmaCounter] ldr r2, =REG_DMA1 @@ -1127,18 +1127,18 @@ m4aSoundVSync_Done: thumb_func_start MPlayMain MPlayMain: ldr r2, lt2_ID_NUMBER - ldr r3, [r0, o_MusicPlayerInfo_ident] + ldr r3, [r0, #o_MusicPlayerInfo_ident] cmp r2, r3 beq _081DD82E bx lr _081DD82E: adds r3, 0x1 - str r3, [r0, o_MusicPlayerInfo_ident] + str r3, [r0, #o_MusicPlayerInfo_ident] push {r0,lr} - ldr r3, [r0, o_MusicPlayerInfo_func] + ldr r3, [r0, #o_MusicPlayerInfo_func] cmp r3, 0 beq _081DD840 - ldr r0, [r0, o_MusicPlayerInfo_intp] + ldr r0, [r0, #o_MusicPlayerInfo_intp] bl call_r3 _081DD840: pop {r0} @@ -1149,7 +1149,7 @@ _081DD840: mov r7, r11 push {r4-r7} adds r7, r0, 0 - ldr r0, [r7, o_MusicPlayerInfo_status] + ldr r0, [r7, #o_MusicPlayerInfo_status] cmp r0, 0 bge _081DD858 b _081DDA6C @@ -1159,18 +1159,18 @@ _081DD858: mov r8, r0 adds r0, r7, 0 bl FadeOutBody - ldr r0, [r7, o_MusicPlayerInfo_status] + ldr r0, [r7, #o_MusicPlayerInfo_status] cmp r0, 0 bge _081DD86C b _081DDA6C _081DD86C: - ldrh r0, [r7, o_MusicPlayerInfo_tempoC] - ldrh r1, [r7, o_MusicPlayerInfo_tempoI] + ldrh r0, [r7, #o_MusicPlayerInfo_tempoC] + ldrh r1, [r7, #o_MusicPlayerInfo_tempoI] adds r0, r1 b _081DD9BC _081DD874: - ldrb r6, [r7, o_MusicPlayerInfo_trackCount] - ldr r5, [r7, o_MusicPlayerInfo_tracks] + ldrb r6, [r7, #o_MusicPlayerInfo_trackCount] + ldr r5, [r7, #o_MusicPlayerInfo_tracks] movs r3, 0x1 movs r4, 0 _081DD87C: @@ -1183,7 +1183,7 @@ _081DD886: mov r10, r3 orrs r4, r3 mov r11, r4 - ldr r4, [r5, o_MusicPlayerTrack_chan] + ldr r4, [r5, #o_MusicPlayerTrack_chan] cmp r4, 0 beq _081DD8BA _081DD892: @@ -1209,7 +1209,7 @@ _081DD8B4: cmp r4, 0 bne _081DD892 _081DD8BA: - ldrb r3, [r5, o_MusicPlayerTrack_flags] + ldrb r3, [r5, #o_MusicPlayerTrack_flags] movs r0, 0x40 tst r0, r3 beq _081DD938 @@ -1218,33 +1218,33 @@ _081DD8BA: movs r0, 0x80 strb r0, [r5] movs r0, 0x2 - strb r0, [r5, o_MusicPlayerTrack_bendRange] + strb r0, [r5, #o_MusicPlayerTrack_bendRange] movs r0, 0x40 - strb r0, [r5, o_MusicPlayerTrack_volX] + strb r0, [r5, #o_MusicPlayerTrack_volX] movs r0, 0x16 - strb r0, [r5, o_MusicPlayerTrack_lfoSpeed] + strb r0, [r5, #o_MusicPlayerTrack_lfoSpeed] movs r0, 0x1 adds r1, r5, 0x6 - strb r0, [r1, o_MusicPlayerTrack_ToneData_type - 0x6] + strb r0, [r1, #o_MusicPlayerTrack_ToneData_type - 0x6] b _081DD938 _081DD8E0: - ldr r2, [r5, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r5, #o_MusicPlayerTrack_cmdPtr] ldrb r1, [r2] cmp r1, 0x80 bhs _081DD8EC - ldrb r1, [r5, o_MusicPlayerTrack_runningStatus] + ldrb r1, [r5, #o_MusicPlayerTrack_runningStatus] b _081DD8F6 _081DD8EC: adds r2, 0x1 - str r2, [r5, o_MusicPlayerTrack_cmdPtr] + str r2, [r5, #o_MusicPlayerTrack_cmdPtr] cmp r1, 0xBD bcc _081DD8F6 - strb r1, [r5, o_MusicPlayerTrack_runningStatus] + strb r1, [r5, #o_MusicPlayerTrack_runningStatus] _081DD8F6: cmp r1, 0xCF bcc _081DD90C mov r0, r8 - ldr r3, [r0, o_SoundInfo_plynote] + ldr r3, [r0, #o_SoundInfo_plynote] adds r0, r1, 0 subs r0, 0xCF adds r1, r7, 0 @@ -1256,15 +1256,15 @@ _081DD90C: bls _081DD92E adds r0, r1, 0 subs r0, 0xB1 - strb r0, [r7, o_MusicPlayerInfo_cmd] + strb r0, [r7, #o_MusicPlayerInfo_cmd] mov r3, r8 - ldr r3, [r3, o_SoundInfo_MPlayJumpTable] + ldr r3, [r3, #o_SoundInfo_MPlayJumpTable] lsls r0, 2 ldr r3, [r3, r0] adds r0, r7, 0 adds r1, r5, 0 bl call_r3 - ldrb r0, [r5, o_MusicPlayerTrack_flags] + ldrb r0, [r5, #o_MusicPlayerTrack_flags] cmp r0, 0 beq _081DD994 b _081DD938 @@ -1273,29 +1273,29 @@ _081DD92E: subs r1, 0x80 adds r1, r0 ldrb r0, [r1] - strb r0, [r5, o_MusicPlayerTrack_wait] + strb r0, [r5, #o_MusicPlayerTrack_wait] _081DD938: - ldrb r0, [r5, o_MusicPlayerTrack_wait] + ldrb r0, [r5, #o_MusicPlayerTrack_wait] cmp r0, 0 beq _081DD8E0 subs r0, 0x1 - strb r0, [r5, o_MusicPlayerTrack_wait] - ldrb r1, [r5, o_MusicPlayerTrack_lfoSpeed] + strb r0, [r5, #o_MusicPlayerTrack_wait] + ldrb r1, [r5, #o_MusicPlayerTrack_lfoSpeed] cmp r1, 0 beq _081DD994 - ldrb r0, [r5, o_MusicPlayerTrack_mod] + ldrb r0, [r5, #o_MusicPlayerTrack_mod] cmp r0, 0 beq _081DD994 - ldrb r0, [r5, o_MusicPlayerTrack_lfoDelayC] + ldrb r0, [r5, #o_MusicPlayerTrack_lfoDelayC] cmp r0, 0 beq _081DD95A subs r0, 0x1 - strb r0, [r5, o_MusicPlayerTrack_lfoDelayC] + strb r0, [r5, #o_MusicPlayerTrack_lfoDelayC] b _081DD994 _081DD95A: - ldrb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] + ldrb r0, [r5, #o_MusicPlayerTrack_lfoSpeedC] adds r0, r1 - strb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] + strb r0, [r5, #o_MusicPlayerTrack_lfoSpeedC] adds r1, r0, 0 subs r0, 0x40 lsls r0, 24 @@ -1307,16 +1307,16 @@ _081DD96E: movs r0, 0x80 subs r2, r0, r1 _081DD972: - ldrb r0, [r5, o_MusicPlayerTrack_mod] + ldrb r0, [r5, #o_MusicPlayerTrack_mod] muls r0, r2 asrs r2, r0, 6 - ldrb r0, [r5, o_MusicPlayerTrack_modM] + ldrb r0, [r5, #o_MusicPlayerTrack_modM] eors r0, r2 lsls r0, 24 beq _081DD994 - strb r2, [r5, o_MusicPlayerTrack_modM] + strb r2, [r5, #o_MusicPlayerTrack_modM] ldrb r0, [r5] - ldrb r1, [r5, o_MusicPlayerTrack_modT] + ldrb r1, [r5, #o_MusicPlayerTrack_modT] cmp r1, 0 bne _081DD98E movs r1, 0xC @@ -1325,7 +1325,7 @@ _081DD98E: movs r1, 0x3 _081DD990: orrs r0, r1 - strb r0, [r5, o_MusicPlayerTrack_flags] + strb r0, [r5, #o_MusicPlayerTrack_flags] _081DD994: mov r3, r10 mov r4, r11 @@ -1337,29 +1337,29 @@ _081DD998: lsls r3, 1 b _081DD87C _081DD9A4: - ldr r0, [r7, o_MusicPlayerInfo_clock] + ldr r0, [r7, #o_MusicPlayerInfo_clock] adds r0, 0x1 - str r0, [r7, o_MusicPlayerInfo_clock] + str r0, [r7, #o_MusicPlayerInfo_clock] cmp r4, 0 bne _081DD9B6 movs r0, 0x80 lsls r0, 24 - str r0, [r7, o_MusicPlayerInfo_status] + str r0, [r7, #o_MusicPlayerInfo_status] b _081DDA6C _081DD9B6: - str r4, [r7, o_MusicPlayerInfo_status] - ldrh r0, [r7, o_MusicPlayerInfo_tempoC] + str r4, [r7, #o_MusicPlayerInfo_status] + ldrh r0, [r7, #o_MusicPlayerInfo_tempoC] subs r0, 0x96 _081DD9BC: - strh r0, [r7, o_MusicPlayerInfo_tempoC] + strh r0, [r7, #o_MusicPlayerInfo_tempoC] cmp r0, 0x96 bcc _081DD9C4 b _081DD874 _081DD9C4: - ldrb r2, [r7, o_MusicPlayerInfo_trackCount] - ldr r5, [r7, o_MusicPlayerInfo_tracks] + ldrb r2, [r7, #o_MusicPlayerInfo_trackCount] + ldr r5, [r7, #o_MusicPlayerInfo_tracks] _081DD9C8: - ldrb r0, [r5, o_MusicPlayerTrack_flags] + ldrb r0, [r5, #o_MusicPlayerTrack_flags] movs r1, 0x80 tst r1, r0 beq _081DDA62 @@ -1370,11 +1370,11 @@ _081DD9C8: adds r0, r7, 0 adds r1, r5, 0 bl TrkVolPitSet - ldr r4, [r5, o_MusicPlayerTrack_chan] + ldr r4, [r5, #o_MusicPlayerTrack_chan] cmp r4, 0 beq _081DDA58 _081DD9E6: - ldrb r1, [r4, o_SoundChannel_status] + ldrb r1, [r4, #o_SoundChannel_status] movs r0, 0xC7 tst r0, r1 bne _081DD9F6 @@ -1382,10 +1382,10 @@ _081DD9E6: bl ClearChain b _081DDA52 _081DD9F6: - ldrb r0, [r4, o_SoundChannel_type] + ldrb r0, [r4, #o_SoundChannel_type] movs r6, 0x7 ands r6, r0 - ldrb r3, [r5, o_MusicPlayerTrack_flags] + ldrb r3, [r5, #o_MusicPlayerTrack_flags] movs r0, 0x3 tst r0, r3 beq _081DDA14 @@ -1397,11 +1397,11 @@ _081DD9F6: orrs r0, r1 strb r0, [r4, o_CgbChannel_mo] _081DDA14: - ldrb r3, [r5, o_MusicPlayerTrack_flags] + ldrb r3, [r5, #o_MusicPlayerTrack_flags] movs r0, 0xC tst r0, r3 beq _081DDA52 - ldrb r1, [r4, o_SoundChannel_ky] + ldrb r1, [r4, #o_SoundChannel_ky] movs r0, 0x8 ldrsb r0, [r5, r0] adds r2, r1, r0 @@ -1411,9 +1411,9 @@ _081DDA28: cmp r6, 0 beq _081DDA46 mov r0, r8 - ldr r3, [r0, o_SoundInfo_MidiKeyToCgbFreq] + ldr r3, [r0, #o_SoundInfo_MidiKeyToCgbFreq] adds r1, r2, 0 - ldrb r2, [r5, o_MusicPlayerTrack_pitM] + ldrb r2, [r5, #o_MusicPlayerTrack_pitM] adds r0, r6, 0 bl call_r3 str r0, [r4, o_CgbChannel_fr] @@ -1424,19 +1424,19 @@ _081DDA28: b _081DDA52 _081DDA46: adds r1, r2, 0 - ldrb r2, [r5, o_MusicPlayerTrack_pitM] - ldr r0, [r4, o_SoundChannel_wav] + ldrb r2, [r5, #o_MusicPlayerTrack_pitM] + ldr r0, [r4, #o_SoundChannel_wav] bl MidiKeyToFreq - str r0, [r4, o_SoundChannel_freq] + str r0, [r4, #o_SoundChannel_freq] _081DDA52: - ldr r4, [r4, o_SoundChannel_np] + ldr r4, [r4, #o_SoundChannel_np] cmp r4, 0 bne _081DD9E6 _081DDA58: - ldrb r0, [r5, o_MusicPlayerTrack_flags] + ldrb r0, [r5, #o_MusicPlayerTrack_flags] movs r1, 0xF0 ands r0, r1 - strb r0, [r5, o_MusicPlayerTrack_flags] + strb r0, [r5, #o_MusicPlayerTrack_flags] mov r2, r9 _081DDA62: subs r2, 0x1 @@ -1446,7 +1446,7 @@ _081DDA62: bgt _081DD9C8 _081DDA6C: ldr r0, lt2_ID_NUMBER - str r0, [r7, o_MusicPlayerInfo_ident] + str r0, [r7, #o_MusicPlayerInfo_ident] pop {r0-r7} mov r8, r0 mov r9, r1 @@ -1467,35 +1467,35 @@ lt2_ID_NUMBER: .word ID_NUMBER TrackStop: push {r4-r6,lr} adds r5, r1, 0 - ldrb r1, [r5, o_MusicPlayerTrack_flags] + ldrb r1, [r5, #o_MusicPlayerTrack_flags] movs r0, 0x80 tst r0, r1 beq TrackStop_Done - ldr r4, [r5, o_MusicPlayerTrack_chan] + ldr r4, [r5, #o_MusicPlayerTrack_chan] cmp r4, 0 beq TrackStop_3 movs r6, 0 TrackStop_Loop: - ldrb r0, [r4, o_SoundChannel_status] + ldrb r0, [r4, #o_SoundChannel_status] cmp r0, 0 beq TrackStop_2 - ldrb r0, [r4, o_SoundChannel_type] + ldrb r0, [r4, #o_SoundChannel_type] movs r3, 0x7 ands r0, r3 beq TrackStop_1 ldr r3, =SOUND_INFO_PTR ldr r3, [r3] - ldr r3, [r3, o_SoundInfo_CgbOscOff] + ldr r3, [r3, #o_SoundInfo_CgbOscOff] bl call_r3 TrackStop_1: - strb r6, [r4, o_SoundChannel_status] + strb r6, [r4, #o_SoundChannel_status] TrackStop_2: - str r6, [r4, o_SoundChannel_track] - ldr r4, [r4, o_SoundChannel_np] + str r6, [r4, #o_SoundChannel_track] + ldr r4, [r4, #o_SoundChannel_np] cmp r4, 0 bne TrackStop_Loop TrackStop_3: - str r4, [r5, o_MusicPlayerTrack_chan] + str r4, [r5, #o_MusicPlayerTrack_chan] TrackStop_Done: pop {r4-r6} pop {r0} @@ -1550,41 +1550,41 @@ ply_note: ldr r1, =gClockTable adds r0, r1 ldrb r0, [r0] - strb r0, [r5, o_MusicPlayerTrack_gateTime] - ldr r3, [r5, o_MusicPlayerTrack_cmdPtr] + strb r0, [r5, #o_MusicPlayerTrack_gateTime] + ldr r3, [r5, #o_MusicPlayerTrack_cmdPtr] ldrb r0, [r3] cmp r0, 0x80 bhs _081DDB46 - strb r0, [r5, o_MusicPlayerTrack_key] + strb r0, [r5, #o_MusicPlayerTrack_key] adds r3, 0x1 ldrb r0, [r3] cmp r0, 0x80 bhs _081DDB44 - strb r0, [r5, o_MusicPlayerTrack_velocity] + strb r0, [r5, #o_MusicPlayerTrack_velocity] adds r3, 0x1 ldrb r0, [r3] cmp r0, 0x80 bhs _081DDB44 - ldrb r1, [r5, o_MusicPlayerTrack_gateTime] + ldrb r1, [r5, #o_MusicPlayerTrack_gateTime] adds r1, r0 - strb r1, [r5, o_MusicPlayerTrack_gateTime] + strb r1, [r5, #o_MusicPlayerTrack_gateTime] adds r3, 0x1 _081DDB44: - str r3, [r5, o_MusicPlayerTrack_cmdPtr] + str r3, [r5, #o_MusicPlayerTrack_cmdPtr] _081DDB46: movs r0, 0 str r0, [sp, 0x14] adds r4, r5, 0 - adds r4, o_MusicPlayerTrack_ToneData_type + adds r4, #o_MusicPlayerTrack_ToneData_type ldrb r2, [r4] movs r0, TONEDATA_TYPE_RHY | TONEDATA_TYPE_SPL tst r0, r2 beq _081DDB98 - ldrb r3, [r5, o_MusicPlayerTrack_key] + ldrb r3, [r5, #o_MusicPlayerTrack_key] movs r0, TONEDATA_TYPE_SPL tst r0, r2 beq _081DDB66 - ldr r1, [r5, o_MusicPlayerTrack_ToneData_keySplitTable] + ldr r1, [r5, #o_MusicPlayerTrack_ToneData_keySplitTable] adds r1, r3 ldrb r0, [r1] b _081DDB68 @@ -1594,7 +1594,7 @@ _081DDB68: lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, [r5, o_MusicPlayerTrack_ToneData_wav] + ldr r0, [r5, #o_MusicPlayerTrack_ToneData_wav] adds r1, r0 mov r9, r1 mov r6, r9 @@ -1787,7 +1787,7 @@ _081DDCBC: bl call_r3 b _081DDCDC _081DDCCE: - ldr r0, [r5, o_MusicPlayerTrack_unk_3C] + ldr r0, [r5, #o_MusicPlayerTrack_unk_3C] str r0, [r4, 0x18] ldrb r2, [r5, 0x9] adds r1, r3, 0 @@ -1816,37 +1816,37 @@ _081DDCEA: thumb_func_start ply_endtie ply_endtie: push {r4,r5} - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r3, [r2] cmp r3, 0x80 bhs _081DDD16 - strb r3, [r1, o_MusicPlayerTrack_key] + strb r3, [r1, #o_MusicPlayerTrack_key] adds r2, 0x1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] + str r2, [r1, #o_MusicPlayerTrack_cmdPtr] b _081DDD18 _081DDD16: - ldrb r3, [r1, o_MusicPlayerTrack_key] + ldrb r3, [r1, #o_MusicPlayerTrack_key] _081DDD18: - ldr r1, [r1, o_MusicPlayerTrack_chan] + ldr r1, [r1, #o_MusicPlayerTrack_chan] cmp r1, 0 beq _081DDD40 movs r4, 0x83 movs r5, 0x40 _081DDD22: - ldrb r2, [r1, o_SoundChannel_status] + ldrb r2, [r1, #o_SoundChannel_status] tst r2, r4 beq _081DDD3A tst r2, r5 bne _081DDD3A - ldrb r0, [r1, o_SoundChannel_mk] + ldrb r0, [r1, #o_SoundChannel_mk] cmp r0, r3 bne _081DDD3A movs r0, 0x40 orrs r2, r0 - strb r2, [r1, o_SoundChannel_status] + strb r2, [r1, #o_SoundChannel_status] b _081DDD40 _081DDD3A: - ldr r1, [r1, o_SoundChannel_np] + ldr r1, [r1, #o_SoundChannel_np] cmp r1, 0 bne _081DDD22 _081DDD40: @@ -1857,9 +1857,9 @@ _081DDD40: thumb_func_start clear_modM clear_modM: movs r2, 0 - strb r2, [r1, o_MusicPlayerTrack_modM] - strb r2, [r1, o_MusicPlayerTrack_lfoSpeedC] - ldrb r2, [r1, o_MusicPlayerTrack_modT] + strb r2, [r1, #o_MusicPlayerTrack_modM] + strb r2, [r1, #o_MusicPlayerTrack_lfoSpeedC] + ldrb r2, [r1, #o_MusicPlayerTrack_modT] cmp r2, 0 bne _081DDD54 movs r2, 0xC @@ -1867,17 +1867,17 @@ clear_modM: _081DDD54: movs r2, 0x3 _081DDD56: - ldrb r3, [r1, o_MusicPlayerTrack_flags] + ldrb r3, [r1, #o_MusicPlayerTrack_flags] orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] + strb r3, [r1, #o_MusicPlayerTrack_flags] bx lr thumb_func_end clear_modM thumb_func_start ld_r3_tp_adr_i ld_r3_tp_adr_i_unchecked: - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldr r2, [r1, #o_MusicPlayerTrack_cmdPtr] adds r3, r2, 1 - str r3, [r1, o_MusicPlayerTrack_cmdPtr] + str r3, [r1, #o_MusicPlayerTrack_cmdPtr] ldrb r3, [r2] bx lr thumb_func_end ld_r3_tp_adr_i @@ -1886,7 +1886,7 @@ ld_r3_tp_adr_i_unchecked: ply_lfos: mov r12, lr bl ld_r3_tp_adr_i_unchecked - strb r3, [r1, o_MusicPlayerTrack_lfoSpeed] + strb r3, [r1, #o_MusicPlayerTrack_lfoSpeed] cmp r3, 0 bne _081DDD7C bl clear_modM @@ -1898,7 +1898,7 @@ _081DDD7C: ply_mod: mov r12, lr bl ld_r3_tp_adr_i_unchecked - strb r3, [r1, o_MusicPlayerTrack_mod] + strb r3, [r1, #o_MusicPlayerTrack_mod] cmp r3, 0 bne _081DDD90 bl clear_modM diff --git a/src/mail.c b/src/mail.c index 0fc62678a7..55bc9ed003 100644 --- a/src/mail.c +++ b/src/mail.c @@ -525,7 +525,7 @@ static void CB2_WaitForPaletteExitOnKeyPress(void) static void CB2_ExitOnKeyPress(void) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); sMailRead->callback2 = CB2_ExitMailReadFreeVars; diff --git a/src/main.c b/src/main.c index 454fefc5cf..b3b76b1fbc 100644 --- a/src/main.c +++ b/src/main.c @@ -81,8 +81,6 @@ void InitIntrHandlers(void); static void WaitForVBlank(void); void EnableVCountIntrAtLine150(void); -#define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON) - void AgbMain() { #if MODERN @@ -136,9 +134,11 @@ void AgbMain() { ReadKeys(); - if (gSoftResetDisabled == FALSE - && (gMain.heldKeysRaw & A_BUTTON) - && (gMain.heldKeysRaw & B_START_SELECT) == B_START_SELECT) + if (!gSoftResetDisabled + && JOY_HELD_RAW(A_BUTTON) + && JOY_HELD_RAW(B_BUTTON) + && JOY_HELD_RAW(START_BUTTON) + && JOY_HELD_RAW(SELECT_BUTTON)) //The reset key combo A + B + START + SELECT { rfu_REQ_stopMode(); rfu_waitREQComplete(); @@ -262,9 +262,7 @@ static void ReadKeys(void) if (keyInput != 0 && gMain.heldKeys == keyInput) { - gMain.keyRepeatCounter--; - - if (gMain.keyRepeatCounter == 0) + if (--gMain.keyRepeatCounter == 0) { gMain.newAndRepeatedKeys = keyInput; gMain.keyRepeatCounter = gKeyRepeatContinueDelay; @@ -282,10 +280,10 @@ static void ReadKeys(void) // Remap L to A if the L=A option is enabled. if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) { - if (gMain.newKeys & L_BUTTON) + if (JOY_NEW(L_BUTTON)) gMain.newKeys |= A_BUTTON; - if (gMain.heldKeys & L_BUTTON) + if (JOY_HELD(L_BUTTON)) gMain.heldKeys |= A_BUTTON; } @@ -343,7 +341,7 @@ static void VBlankIntr(void) { if (gWirelessCommType != 0) RfuVSync(); - else if (gLinkVSyncDisabled == FALSE) + else if (!gLinkVSyncDisabled) LinkVSync(); gMain.vblankCounter1++; diff --git a/src/main_menu.c b/src/main_menu.c index a4de99207b..e8403cdb17 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -696,7 +696,7 @@ static void Task_MainMenuCheckSaveFile(u8 taskId) static void Task_WaitForSaveFileErrorWindow(u8 taskId) { RunTextPrinters(); - if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON)) + if (!IsTextPrinterActive(7) && (JOY_NEW(A_BUTTON))) { ClearWindowTilemap(7); ClearMainMenuWindowTilemap(&sWindowTemplates_MainMenu[7]); @@ -731,7 +731,7 @@ static void Task_MainMenuCheckBattery(u8 taskId) static void Task_WaitForBatteryDryErrorWindow(u8 taskId) { RunTextPrinters(); - if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON)) + if (!IsTextPrinterActive(7) && (JOY_NEW(A_BUTTON))) { ClearWindowTilemap(7); ClearMainMenuWindowTilemap(&sWindowTemplates_MainMenu[7]); @@ -887,14 +887,14 @@ static bool8 HandleMainMenuInput(u8 taskId) { s16* data = gTasks[taskId].data; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); IsWirelessAdapterConnected(); // why bother calling this here? debug? Task_HandleMainMenuAPressed will check too BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_HandleMainMenuAPressed; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA); @@ -902,7 +902,7 @@ static bool8 HandleMainMenuInput(u8 taskId) SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160)); gTasks[taskId].func = Task_HandleMainMenuBPressed; } - else if ((gMain.newKeys & DPAD_UP) && tCurrItem > 0) + else if ((JOY_NEW(DPAD_UP)) && tCurrItem > 0) { if (tMenuType == HAS_MYSTERY_EVENTS && tIsScrolled == TRUE && tCurrItem == 1) { @@ -914,7 +914,7 @@ static bool8 HandleMainMenuInput(u8 taskId) sCurrItemAndOptionMenuCheck = tCurrItem; return TRUE; } - else if ((gMain.newKeys & DPAD_DOWN) && tCurrItem < tItemCount - 1) + else if ((JOY_NEW(DPAD_DOWN)) && tCurrItem < tItemCount - 1) { if (tMenuType == HAS_MYSTERY_EVENTS && tCurrItem == 3 && tIsScrolled == FALSE) { @@ -1151,7 +1151,7 @@ static void Task_DisplayMainMenuInvalidActionError(u8 taskId) gTasks[taskId].tCurrItem++; break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); @@ -1292,7 +1292,7 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId) gTasks[taskId].tPlayerSpriteId = 0xFF; gTasks[taskId].data[3] = 0xFF; gTasks[taskId].tTimer = 0xD8; - PlayBGM(MUS_DOORO_X4); + PlayBGM(MUS_ROUTE122); ShowBg(0); ShowBg(1); } @@ -1594,7 +1594,7 @@ static void Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint(u8 taskId) static void Task_NewGameBirchSpeech_WaitPressBeforeNameChoice(u8 taskId) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_NewGameBirchSpeech_StartNamingScreen; diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 32da4d0b4f..8939edd908 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -121,9 +121,9 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] = [MAPSEC_ROUTE_133] = MAPPOPUP_THEME_UNDERWATER, [MAPSEC_ROUTE_134] = MAPPOPUP_THEME_UNDERWATER, [MAPSEC_UNDERWATER_124] = MAPPOPUP_THEME_STONE2, - [MAPSEC_UNDERWATER_125] = MAPPOPUP_THEME_STONE2, [MAPSEC_UNDERWATER_126] = MAPPOPUP_THEME_STONE2, [MAPSEC_UNDERWATER_127] = MAPPOPUP_THEME_STONE2, + [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2, [MAPSEC_UNDERWATER_SOOTOPOLIS] = MAPPOPUP_THEME_STONE2, [MAPSEC_GRANITE_CAVE] = MAPPOPUP_THEME_STONE, [MAPSEC_MT_CHIMNEY] = MAPPOPUP_THEME_STONE, @@ -139,7 +139,7 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] = [MAPSEC_AQUA_HIDEOUT_OLD] = MAPPOPUP_THEME_STONE, [MAPSEC_SHOAL_CAVE] = MAPPOPUP_THEME_STONE, [MAPSEC_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE, - [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2, + [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE2, [MAPSEC_VICTORY_ROAD] = MAPPOPUP_THEME_STONE, [MAPSEC_MIRAGE_ISLAND] = MAPPOPUP_THEME_WOOD, [MAPSEC_CAVE_OF_ORIGIN] = MAPPOPUP_THEME_STONE, @@ -167,8 +167,8 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] = [MAPSEC_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE, [MAPSEC_UNDERWATER_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, [MAPSEC_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE, - [MAPSEC_UNDERWATER_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, - [MAPSEC_UNDERWATER_UNK1 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, + [MAPSEC_UNDERWATER_105 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, + [MAPSEC_UNDERWATER_125 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, [MAPSEC_UNDERWATER_129 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2, [MAPSEC_DESERT_UNDERPASS - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE, [MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE, diff --git a/src/match_call.c b/src/match_call.c index 307b844136..1899eabf03 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1119,7 +1119,7 @@ static void StartMatchCall(void) sub_808BCF4(); } - PlaySE(SE_TOREEYE); + PlaySE(SE_POKENAV_CALL); CreateTask(ExecuteMatchCall, 1); } @@ -1253,11 +1253,11 @@ static bool32 sub_81962D8(u8 taskId) static bool32 sub_8196330(u8 taskId) { s16 *taskData = gTasks[taskId].data; - if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && JOY_NEW(A_BUTTON | B_BUTTON)) { FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8)); CopyWindowToVram(taskData[2], 2); - PlaySE(SE_TOREOFF); + PlaySE(SE_POKENAV_HANG_UP); return TRUE; } @@ -1335,7 +1335,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.unk = 0; + printerTemplate.style = 0; printerTemplate.fgColor = 10; printerTemplate.bgColor = 8; printerTemplate.shadowColor = 14; @@ -1346,7 +1346,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str) static bool32 ExecuteMatchCallTextPrinter(int windowId) { - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) gTextFlags.canABSpeedUpPrint = 1; else gTextFlags.canABSpeedUpPrint = 0; @@ -1774,7 +1774,7 @@ static int GetNumOwnedBadges(void) static bool32 sub_8196D74(int matchCallId) { int dayCount; - int otId; + u32 otId; u16 easyChatWord; int numRematchTrainersFought; int var0, var1, var2; diff --git a/src/menu.c b/src/menu.c index ac2f7d85bd..9c5dec024e 100644 --- a/src/menu.c +++ b/src/menu.c @@ -180,7 +180,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed printer.currentY = 1; printer.letterSpacing = 0; printer.lineSpacing = 0; - printer.unk = 0; + printer.style = 0; printer.fgColor = fgColor; printer.bgColor = bgColor; printer.shadowColor = shadowColor; @@ -981,23 +981,23 @@ u8 Menu_GetCursorPos(void) s8 Menu_ProcessInput(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (!sMenu.APressMuted) PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { PlaySE(SE_SELECT); Menu_MoveCursor(-1); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { PlaySE(SE_SELECT); Menu_MoveCursor(1); @@ -1011,23 +1011,23 @@ s8 Menu_ProcessInputNoWrap(void) { u8 oldPos = sMenu.cursorPos; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (!sMenu.APressMuted) PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (oldPos != Menu_MoveCursorNoWrapAround(-1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (oldPos != Menu_MoveCursorNoWrapAround(1)) PlaySE(SE_SELECT); @@ -1039,23 +1039,23 @@ s8 Menu_ProcessInputNoWrap(void) s8 ProcessMenuInput_other(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (!sMenu.APressMuted) PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP) { PlaySE(SE_SELECT); Menu_MoveCursor(-1); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN) { PlaySE(SE_SELECT); Menu_MoveCursor(1); @@ -1069,23 +1069,23 @@ s8 Menu_ProcessInputNoWrapAround_other(void) { u8 oldPos = sMenu.cursorPos; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (!sMenu.APressMuted) PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + if (JOY_REPEAT(DPAD_ANY) == DPAD_UP) { if (oldPos != Menu_MoveCursorNoWrapAround(-1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN) { if (oldPos != Menu_MoveCursorNoWrapAround(1)) PlaySE(SE_SELECT); @@ -1130,7 +1130,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(fontId, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(fontId, FONTATTR_STYLE); printer.letterSpacing = letterSpacing; printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); printer.x = left; @@ -1194,7 +1194,7 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(fontId, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(fontId, FONTATTR_STYLE); printer.letterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); @@ -1252,7 +1252,7 @@ void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(fontId, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(fontId, FONTATTR_STYLE); printer.letterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); @@ -1299,10 +1299,12 @@ u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight, else sMenu.cursorPos = pos; - sub_8199134(0, 0); + // Why call this when it's not gonna move? + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_NONE); return sMenu.cursorPos; } +// Unused u8 sub_8198FD4(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7) { u8 cursorHeight = GetMenuCursorDimensionByFont(fontId, 1); @@ -1333,40 +1335,28 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos) 0); } -u8 sub_8199134(s8 deltaX, s8 deltaY) +u8 ChangeListMenuCursorPosition(s8 deltaX, s8 deltaY) { u8 oldPos = sMenu.cursorPos; if (deltaX != 0) { if ((sMenu.cursorPos % sMenu.columns) + deltaX < 0) - { sMenu.cursorPos += sMenu.columns - 1; - } else if ((sMenu.cursorPos % sMenu.columns) + deltaX >= sMenu.columns) - { sMenu.cursorPos = (sMenu.cursorPos / sMenu.columns) * sMenu.columns; - } else - { sMenu.cursorPos += deltaX; - } } if (deltaY != 0) { if ((sMenu.cursorPos / sMenu.columns) + deltaY < 0) - { sMenu.cursorPos += sMenu.columns * (sMenu.rows - 1); - } else if ((sMenu.cursorPos / sMenu.columns) + deltaY >= sMenu.rows) - { sMenu.cursorPos -= sMenu.columns * (sMenu.rows - 1); - } else - { sMenu.cursorPos += (sMenu.columns * deltaY); - } } if (sMenu.cursorPos > sMenu.maxCursorPos) @@ -1381,7 +1371,7 @@ u8 sub_8199134(s8 deltaX, s8 deltaY) } } -u8 sub_81991F8(s8 deltaX, s8 deltaY) +u8 ChangeGridMenuCursorPosition(s8 deltaX, s8 deltaY) { u8 oldPos = sMenu.cursorPos; @@ -1417,37 +1407,37 @@ u8 sub_81991F8(s8 deltaX, s8 deltaY) s8 sub_8199284(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { PlaySE(SE_SELECT); - sub_8199134(0, -1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { PlaySE(SE_SELECT); - sub_8199134(0, 1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { PlaySE(SE_SELECT); - sub_8199134(-1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { PlaySE(SE_SELECT); - sub_8199134(1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE); return MENU_NOTHING_CHOSEN; } @@ -1458,36 +1448,36 @@ s8 Menu_ProcessInputGridLayout(void) { u8 oldPos = sMenu.cursorPos; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { - if (oldPos != sub_81991F8(0, -1)) + if (oldPos != ChangeGridMenuCursorPosition(0, -1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { - if (oldPos != sub_81991F8(0, 1)) + if (oldPos != ChangeGridMenuCursorPosition(0, 1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { - if (oldPos != sub_81991F8(-1, 0)) + if (oldPos != ChangeGridMenuCursorPosition(-1, 0)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { - if (oldPos != sub_81991F8(1, 0)) + if (oldPos != ChangeGridMenuCursorPosition(1, 0)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } @@ -1497,77 +1487,78 @@ s8 Menu_ProcessInputGridLayout(void) s8 sub_81993D8(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP) { PlaySE(SE_SELECT); - sub_8199134(0, -1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN) { PlaySE(SE_SELECT); - sub_8199134(0, 1); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) { PlaySE(SE_SELECT); - sub_8199134(-1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) { PlaySE(SE_SELECT); - sub_8199134(1, 0); + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE); return MENU_NOTHING_CHOSEN; } return MENU_NOTHING_CHOSEN; } +//Unused s8 sub_8199484(void) { u8 oldPos = sMenu.cursorPos; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); return sMenu.cursorPos; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return MENU_B_PRESSED; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP) { - if (oldPos != sub_81991F8(0, -1)) + if (oldPos != ChangeGridMenuCursorPosition(0, -1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN) { - if (oldPos != sub_81991F8(0, 1)) + if (oldPos != ChangeGridMenuCursorPosition(0, 1)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) { - if (oldPos != sub_81991F8(-1, 0)) + if (oldPos != ChangeGridMenuCursorPosition(-1, 0)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) { - if (oldPos != sub_81991F8(1, 0)) + if (oldPos != ChangeGridMenuCursorPosition(1, 0)) PlaySE(SE_SELECT); return MENU_NOTHING_CHOSEN; } @@ -1625,7 +1616,7 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const printer.fgColor = GetFontAttribute(1, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(1, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(1, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(1, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(1, FONTATTR_STYLE); printer.letterSpacing = 0; printer.lineSpacing = 0; printer.x = 8; @@ -1659,7 +1650,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa printer.fgColor = GetFontAttribute(1, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(1, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(1, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(1, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(1, FONTATTR_STYLE); printer.letterSpacing = 0; printer.lineSpacing = 0; @@ -1690,7 +1681,7 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M printer.fgColor = GetFontAttribute(1, FONTATTR_COLOR_FOREGROUND); printer.bgColor = GetFontAttribute(1, FONTATTR_COLOR_BACKGROUND); printer.shadowColor = GetFontAttribute(1, FONTATTR_COLOR_SHADOW); - printer.unk = GetFontAttribute(1, FONTATTR_UNKNOWN); + printer.style = GetFontAttribute(1, FONTATTR_STYLE); printer.letterSpacing = 0; printer.lineSpacing = 0; @@ -1732,7 +1723,8 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCurso else sMenu.cursorPos = pos; - sub_8199134(0, 0); + // Why call this when it's not gonna move? + ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_NONE); return sMenu.cursorPos; } @@ -1957,7 +1949,7 @@ void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const printer.currentY = printer.y; printer.letterSpacing = GetFontAttribute(fontId, 2); printer.lineSpacing = GetFontAttribute(fontId, 3); - printer.unk = 0; + printer.style = 0; printer.fgColor = color[1]; printer.bgColor = color[0]; printer.shadowColor = color[2]; @@ -1978,7 +1970,7 @@ void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 left, u8 top, u8 le printer.currentY = printer.y; printer.letterSpacing = letterSpacing; printer.lineSpacing = lineSpacing; - printer.unk = 0; + printer.style = 0; printer.fgColor = color[1]; printer.bgColor = color[0]; printer.shadowColor = color[2]; @@ -1999,7 +1991,7 @@ void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left printer.currentY = top; printer.letterSpacing = letterSpacing; printer.lineSpacing = lineSpacing; - printer.unk = 0; + printer.style = 0; printer.fgColor = GetFontAttribute(fontId, 5); printer.bgColor = GetFontAttribute(fontId, 6); diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 69443d3099..c80e52d270 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -183,7 +183,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) { s16 valBefore = (*arg0); - if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + if (JOY_REPEAT(DPAD_ANY) == DPAD_UP) { (*arg0)++; if ((*arg0) > arg1) @@ -199,7 +199,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN) { (*arg0)--; if ((*arg0) <= 0) @@ -215,7 +215,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT) { (*arg0) += 10; if ((*arg0) > arg1) @@ -231,7 +231,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT) + else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT) { (*arg0) -= 10; if ((*arg0) <= 0) @@ -255,9 +255,9 @@ u8 GetLRKeysPressed(void) { if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.newKeys & L_BUTTON) + if (JOY_NEW(L_BUTTON)) return MENU_L_PRESSED; - if (gMain.newKeys & R_BUTTON) + if (JOY_NEW(R_BUTTON)) return MENU_R_PRESSED; } @@ -268,9 +268,9 @@ u8 GetLRKeysPressedAndHeld(void) { if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.newAndRepeatedKeys & L_BUTTON) + if (JOY_REPEAT(L_BUTTON)) return MENU_L_PRESSED; - if (gMain.newAndRepeatedKeys & R_BUTTON) + if (JOY_REPEAT(R_BUTTON)) return MENU_R_PRESSED; } diff --git a/src/menu_specialized.c b/src/menu_specialized.c index a99c5c9d0b..d402ecb518 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -894,76 +894,73 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId) { return StringCopyPadded(dst, gText_EggNickname, 0, 12); } + GetBoxOrPartyMonData(boxId, monId, MON_DATA_NICKNAME, dst); + StringGetEnd10(dst); + species = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SPECIES, NULL); + if (boxId == TOTAL_BOXES_COUNT) // Party mon. + { + level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL); + gender = GetMonGender(&gPlayerParty[monId]); + } else { - GetBoxOrPartyMonData(boxId, monId, MON_DATA_NICKNAME, dst); - StringGetEnd10(dst); - species = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SPECIES, NULL); - if (boxId == TOTAL_BOXES_COUNT) // Party mon. - { - level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL); - gender = GetMonGender(&gPlayerParty[monId]); - } - else - { - // Needed to match, feel free to remove. - boxId++;boxId--; - monId++;monId--; + // Needed to match, feel free to remove. + boxId++, boxId--; + monId++, monId--; - boxMon = GetBoxedMonPtr(boxId, monId); - gender = GetBoxMonGender(boxMon); - level = GetLevelFromBoxMonExp(boxMon); - } - - if ((species == SPECIES_NIDORAN_F || species == SPECIES_NIDORAN_M) && !StringCompare(dst, gSpeciesNames[species])) - gender = MON_GENDERLESS; - - for (str = dst; *str != EOS; str++) - ; - - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_SKIP; - *(str++) = 60; - - switch (gender) - { - default: - *(str++) = CHAR_SPACE; - break; - case MON_MALE: - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_COLOR; - *(str++) = TEXT_COLOR_RED; - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_SHADOW; - *(str++) = TEXT_COLOR_LIGHT_RED; - *(str++) = CHAR_MALE; - break; - case MON_FEMALE: - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_COLOR; - *(str++) = TEXT_COLOR_GREEN; - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_SHADOW; - *(str++) = TEXT_COLOR_LIGHT_GREEN; - *(str++) = CHAR_FEMALE; - break; - } - - *(str++) = EXT_CTRL_CODE_BEGIN; - *(str++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; - *(str++) = TEXT_COLOR_BLUE; - *(str++) = TEXT_COLOR_TRANSPARENT; - *(str++) = TEXT_COLOR_LIGHT_BLUE; - *(str++) = CHAR_SLASH; - *(str++) = CHAR_EXTRA_SYMBOL; - *(str++) = CHAR_LV_2; - str = ConvertIntToDecimalStringN(str, level, STR_CONV_MODE_LEFT_ALIGN, 3); - *(str++) = CHAR_SPACE; - *str = EOS; - - return str; + boxMon = GetBoxedMonPtr(boxId, monId); + gender = GetBoxMonGender(boxMon); + level = GetLevelFromBoxMonExp(boxMon); } + + if ((species == SPECIES_NIDORAN_F || species == SPECIES_NIDORAN_M) && !StringCompare(dst, gSpeciesNames[species])) + gender = MON_GENDERLESS; + + for (str = dst; *str != EOS; str++) + ; + + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_SKIP; + *(str++) = 60; + + switch (gender) + { + default: + *(str++) = CHAR_SPACE; + break; + case MON_MALE: + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_COLOR; + *(str++) = TEXT_COLOR_RED; + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_SHADOW; + *(str++) = TEXT_COLOR_LIGHT_RED; + *(str++) = CHAR_MALE; + break; + case MON_FEMALE: + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_COLOR; + *(str++) = TEXT_COLOR_GREEN; + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_SHADOW; + *(str++) = TEXT_COLOR_LIGHT_GREEN; + *(str++) = CHAR_FEMALE; + break; + } + + *(str++) = EXT_CTRL_CODE_BEGIN; + *(str++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; + *(str++) = TEXT_COLOR_BLUE; + *(str++) = TEXT_COLOR_TRANSPARENT; + *(str++) = TEXT_COLOR_LIGHT_BLUE; + *(str++) = CHAR_SLASH; + *(str++) = CHAR_EXTRA_SYMBOL; + *(str++) = CHAR_LV_2; + str = ConvertIntToDecimalStringN(str, level, STR_CONV_MODE_LEFT_ALIGN, 3); + *(str++) = CHAR_SPACE; + *str = EOS; + + return str; } // Buffers the string in src to dest up to n chars. If src is less than n chars, fill with spaces diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 435ad72336..dde4de3292 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -1107,7 +1107,7 @@ bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8 metatileBehavior) +bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8 metatileBehavior) { if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_1) return TRUE; @@ -1115,7 +1115,7 @@ bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8 metatileBehavior) +bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8 metatileBehavior) { if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_2) return TRUE; @@ -1123,7 +1123,7 @@ bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8 metatileBehavior) +bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8 metatileBehavior) { if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_1) return TRUE; @@ -1131,7 +1131,7 @@ bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8 metatileBehavior) +bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8 metatileBehavior) { if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_2) return TRUE; diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index be1c42e29c..cd5710d446 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -227,7 +227,7 @@ static void sub_802E938(struct Sprite *sprite) sprite->invisible = FALSE; case 1: case 2: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); StartSpriteAnim(sprite, sprite->data[2]); break; case 3: @@ -249,7 +249,7 @@ static void sub_802E938(struct Sprite *sprite) static void sub_802EA50(u8 taskId) { s16 *data = gTasks[taskId].data; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); gSprites[data[13]].callback = sub_802E938; gSprites[data[13]].invisible = FALSE; gTasks[taskId].data[0] = 3; @@ -262,15 +262,15 @@ static void sub_802EAB0(u8 taskId) if (gReceivedRemoteLinkPlayers != 0) { - if (gRecvCmds[0][1] == 0x7FFF) + if (gRecvCmds[0][1] == LINKCMD_0x7FFF) data[11] = gRecvCmds[0][2]; if (GetMultiplayerId() == 0) { data[12]++; memset(packet, 0, sizeof(packet)); - packet[0] = 0x7FFF; + packet[0] = LINKCMD_0x7FFF; packet[1] = data[12]; - sub_800FE50(packet); + Rfu_SendPacket(packet); } } else @@ -350,7 +350,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId) // fallthrough case 1: if (sprite->data[2] == 0) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (++sprite->data[2] >= 20) { sprite->data[2] = 0; @@ -443,7 +443,7 @@ static void SpriteCB_Start(struct Sprite *sprite) sprite->pos2.y = data[5] >> 4; if (sprite->pos2.y >= 0) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); sprite->pos2.y = 0; data[0]++; } @@ -452,7 +452,7 @@ static void SpriteCB_Start(struct Sprite *sprite) data[1] += 12; if (data[1] >= 128) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); data[1] = 0; data[0]++; } @@ -463,7 +463,7 @@ static void SpriteCB_Start(struct Sprite *sprite) data[1] += 16; if (data[1] >= 128) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); data[1] = 0; data[0]++; } diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 02cccf2a5b..607083e267 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -370,7 +370,7 @@ static void StartScreenShake(u8 yShakeOffset, u8 xShakeOffset, u8 numShakes, u8 gTasks[taskId].data[3] = shakeDelay; gTasks[taskId].data[4] = yShakeOffset; SetCameraPanningCallback(NULL); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); } static void DoScreenShake(u8 taskId) @@ -723,145 +723,40 @@ static void sub_81BF248(struct Sprite *sprite) } } -#ifdef NONMATCHING static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e) { - u8 r5, r4, r0, r2; - u16 var; + u16 var, var2; + u8 r0, r5, r4, r2; + u8 r2_1, r4_1; + u8 b2, c2; - r4 = r5 = b / d; + r4 = b / d; gUnknown_030012A8[0] = r4; - r0 = r2 = b % d; + r2 = b % d; gUnknown_030012A8[1] = r2; - r4 &= 7; - r2 &= 7; - gUnknown_030012A8[2] = r4; - gUnknown_030012A8[3] = r2; + r4_1 = r4 & 7; + r2_1 = r2 & 7; - r0 /= 8; - r5 /= 8; - gUnknown_030012A8[4] = r0; - gUnknown_030012A8[5] = r5; + gUnknown_030012A8[2] = r4 & 7; //should be r4_1 but that doesn't match + gUnknown_030012A8[3] = r2 & 7; //should be r2_1 but that doesn't match + + r0 = r2 / 8; + r5 = r4 / 8; + + gUnknown_030012A8[4] = r2 / 8; //should just be r0, but that doesn't match + gUnknown_030012A8[5] = r4 / 8; //should be just r5 but that doesn't match + + var = (d / 8) * (r5 * 64) + (r0 * 64); - var = ((d / 8) * (r5 * 64)) + (r0 * 64); gUnknown_030012A8[6] = var; - var += (r4 * 8) + r2; - gUnknown_030012A8[7] = var; + var2 = var + ((r4_1 * 8) + r2_1); + var2 /= 2; + gUnknown_030012A8[7] = var + ((r4_1 * 8) + r2_1); // should be var2 with var2 being divided by 2 AFTER this assignment, but that doesn't match. - // This part is non-matching. 99% sure it IS functionally equivalent, though. - b = (b & 1) ^ 1; - c = (c << ((b) << 2)) | (15 << ((b ^ 1) << 2)); - - a[(var / 2) + (e * 32)] &= c; + b2 = ((b % 2) ^ 1); + c2 = (c << (b2 << 2)) | (15 << (((b2 ^ 1) << 2))); + a[var2 + (e * 32)] &= c2; } - -#else -NAKED -static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - str r0, [sp]\n\ - mov r10, r1\n\ - adds r6, r2, 0\n\ - mov r8, r3\n\ - ldr r0, [sp, 0x28]\n\ - mov r9, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - mov r10, r1\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r0, r8\n\ - lsls r0, 24\n\ - mov r8, r0\n\ - lsrs r7, r0, 24\n\ - mov r1, r9\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r9, r1\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - bl __divsi3\n\ - adds r5, r0, 0\n\ - lsls r5, 24\n\ - lsrs r4, r5, 24\n\ - ldr r3, =gUnknown_030012A8\n\ - strh r4, [r3]\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - str r3, [sp, 0x4]\n\ - bl __modsi3\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r3, [sp, 0x4]\n\ - strh r2, [r3, 0x2]\n\ - movs r1, 0x7\n\ - ands r4, r1\n\ - ands r2, r1\n\ - strh r4, [r3, 0x4]\n\ - strh r2, [r3, 0x6]\n\ - lsrs r0, 27\n\ - lsrs r5, 27\n\ - strh r0, [r3, 0x8]\n\ - strh r5, [r3, 0xA]\n\ - mov r1, r8\n\ - lsrs r1, 27\n\ - lsls r1, 6\n\ - mov r8, r1\n\ - mov r1, r8\n\ - muls r1, r5\n\ - lsls r0, 6\n\ - adds r1, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - strh r1, [r3, 0xC]\n\ - lsls r4, 3\n\ - adds r4, r2\n\ - adds r1, r4\n\ - lsls r4, r1, 16\n\ - lsrs r4, 17\n\ - strh r1, [r3, 0xE]\n\ - movs r1, 0x1\n\ - mov r0, r10\n\ - ands r1, r0\n\ - movs r2, 0x1\n\ - eors r1, r2\n\ - lsls r0, r1, 2\n\ - lsls r6, r0\n\ - eors r1, r2\n\ - lsls r1, 2\n\ - movs r0, 0xF\n\ - lsls r0, r1\n\ - orrs r6, r0\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r1, r9\n\ - lsls r1, 5\n\ - mov r9, r1\n\ - add r9, r4\n\ - ldr r1, [sp]\n\ - add r1, r9\n\ - ldrb r0, [r1]\n\ - ands r6, r0\n\ - strb r6, [r1]\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - "); -} -#endif // NONMATCHING diff --git a/src/mon_markings.c b/src/mon_markings.c index db5df07e82..c2afdda833 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -394,7 +394,7 @@ bool8 sub_811FBA4(void) { u16 i; - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { s8 pos; PlaySE(SE_SELECT); @@ -404,7 +404,7 @@ bool8 sub_811FBA4(void) return TRUE; } - if (gMain.newKeys & DPAD_DOWN) + if (JOY_NEW(DPAD_DOWN)) { s8 pos; PlaySE(SE_SELECT); @@ -414,7 +414,7 @@ bool8 sub_811FBA4(void) return TRUE; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); @@ -433,7 +433,7 @@ bool8 sub_811FBA4(void) return TRUE; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); return FALSE; diff --git a/src/move_relearner.c b/src/move_relearner.c index 1c863804be..cd4da58354 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -150,20 +150,22 @@ #define JAM_HEART_EMPTY 2 #define JAM_HEART_FULL 3 +#define MAX_RELEARNER_MOVES (MAX_LEVEL_UP_MOVES > 25 ? MAX_LEVEL_UP_MOVES : 25) + static EWRAM_DATA struct { u8 state; - u8 heartSpriteIds[16]; /*0x001*/ - u16 movesToLearn[25]; /*0x01A*/ - u8 partyMon; /*0x044*/ - u8 moveSlot; /*0x045*/ - struct ListMenuItem menuItems[25]; /*0x0E8*/ - u8 numMenuChoices; /*0x110*/ - u8 numToShowAtOnce; /*0x111*/ - u8 moveListMenuTask; /*0x112*/ - u8 moveListScrollArrowTask; /*0x113*/ - u8 moveDisplayArrowTask; /*0x114*/ - u16 scrollOffset; /*0x116*/ + u8 heartSpriteIds[16]; /*0x001*/ + u16 movesToLearn[MAX_RELEARNER_MOVES]; /*0x01A*/ + u8 partyMon; /*0x044*/ + u8 moveSlot; /*0x045*/ + struct ListMenuItem menuItems[MAX_RELEARNER_MOVES]; /*0x0E8*/ + u8 numMenuChoices; /*0x110*/ + u8 numToShowAtOnce; /*0x111*/ + u8 moveListMenuTask; /*0x112*/ + u8 moveListScrollArrowTask; /*0x113*/ + u8 moveDisplayArrowTask; /*0x114*/ + u16 scrollOffset; /*0x116*/ } *sMoveRelearnerStruct = {0}; static EWRAM_DATA struct { @@ -713,13 +715,13 @@ static void DoMoveRelearnerMain(void) { FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew); sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); } break; case MENU_STATE_PRINT_TEXT_THEN_FANFARE: if (!MoveRelearnerRunTextPrinters()) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE; } break; @@ -730,7 +732,7 @@ static void DoMoveRelearnerMain(void) } break; case MENU_STATE_WAIT_FOR_A_BUTTON: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; @@ -776,7 +778,7 @@ static void HandleInput(bool8 showContest) switch (itemId) { case LIST_NOTHING_CHOSEN: - if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysPressed()) + if (!(JOY_NEW(DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysPressed()) { break; } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 032cc33403..00dcbf0e3c 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -163,7 +163,7 @@ static void CB2_MysteryEventMenu(void) PrintMysteryMenuText(0, gText_PressAToLoadEvent, 1, 2, 1); gMain.state++; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); CloseLink(); @@ -177,7 +177,7 @@ static void CB2_MysteryEventMenu(void) case 5: if (GetLinkPlayerCount_2() == 2) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); CheckShouldAdvanceLinkState(); @@ -187,7 +187,7 @@ static void CB2_MysteryEventMenu(void) CopyWindowToVram(1, 3); gMain.state++; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); CloseLink(); @@ -227,7 +227,7 @@ static void CB2_MysteryEventMenu(void) } } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); CloseLink(); @@ -274,7 +274,7 @@ static void CB2_MysteryEventMenu(void) } break; case 14: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); gMain.state++; diff --git a/src/mystery_gift.c b/src/mystery_gift.c index 7f1370a5e4..a23f159b2d 100644 --- a/src/mystery_gift.c +++ b/src/mystery_gift.c @@ -431,7 +431,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader) case 3: ShowBg(0); ShowBg(3); - PlayBGM(MUS_RG_OKURIMONO); + PlayBGM(MUS_RG_MYSTERY_GIFT); SetVBlankCallback(vblankcb_mystery_gift_e_reader_run); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); return TRUE; @@ -561,7 +561,7 @@ bool32 MG_PrintTextOnWindow1AndWaitButton(u8 *textState, const u8 *str) goto inc; case 1: DrawDownArrow(1, 0xD0, 0x14, 1, FALSE, &sDownArrowCounterAndYCoordIdx[0], &sDownArrowCounterAndYCoordIdx[1]); - if (({gMain.newKeys & (A_BUTTON | B_BUTTON);})) + if (({JOY_NEW(A_BUTTON | B_BUTTON);})) { inc: (*textState)++; @@ -595,7 +595,7 @@ bool32 unref_HideDownArrowAndWaitButton(u8 * textState) { case 0: HideDownArrow(); - if (({gMain.newKeys & (A_BUTTON | B_BUTTON);})) + if (({JOY_NEW(A_BUTTON | B_BUTTON);})) { (*textState)++; } @@ -930,7 +930,7 @@ static bool32 mevent_save_game(u8 * state) (*state)++; break; case 3: - if (({gMain.newKeys & (A_BUTTON | B_BUTTON);})) + if (({JOY_NEW(A_BUTTON | B_BUTTON);})) { (*state)++; } @@ -1023,7 +1023,7 @@ static bool32 PrintMGSuccessMessage(u8 * state, const u8 * arg1, u16 * arg2) { AddTextPrinterToWindow1(arg1); } - PlayFanfare(MUS_FANFA4); + PlayFanfare(MUS_OBTAIN_ITEM); *arg2 = 0; (*state)++; break; @@ -1458,11 +1458,11 @@ void task00_mystery_gift(u8 taskId) case 20: if (data->IsCardOrNews == 0) { - if (({gMain.newKeys & A_BUTTON;})) + if (({JOY_NEW(A_BUTTON);})) { data->state = 21; } - if (({gMain.newKeys & B_BUTTON;})) + if (({JOY_NEW(B_BUTTON);})) { data->state = 27; } diff --git a/src/naming_screen.c b/src/naming_screen.c index 4ed9d78d0c..be921078eb 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1823,7 +1823,7 @@ static void DeleteTextCharacter(void) // It incorrectly leaves the Back key 1 shade lighter than its default if (keyRole == KEY_ROLE_CHAR || keyRole == KEY_ROLE_BACKSPACE) TryStartButtonFlash(BUTTON_BACK, FALSE, TRUE); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } // Returns TRUE if the text entry is now full diff --git a/src/option_menu.c b/src/option_menu.c index 1cf0bad2ed..b6440a89c0 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -271,16 +271,16 @@ static void Task_OptionMenuFadeIn(u8 taskId) static void Task_OptionMenuProcessInput(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL) gTasks[taskId].func = Task_OptionMenuSave; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { gTasks[taskId].func = Task_OptionMenuSave; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (gTasks[taskId].data[TD_MENUSELECTION] > 0) gTasks[taskId].data[TD_MENUSELECTION]--; @@ -288,7 +288,7 @@ static void Task_OptionMenuProcessInput(u8 taskId) gTasks[taskId].data[TD_MENUSELECTION] = MENUITEM_CANCEL; HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (gTasks[taskId].data[TD_MENUSELECTION] < MENUITEM_CANCEL) gTasks[taskId].data[TD_MENUSELECTION]++; @@ -405,7 +405,7 @@ static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style) static u8 TextSpeed_ProcessInput(u8 selection) { - if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) { if (selection <= 1) selection++; @@ -414,7 +414,7 @@ static u8 TextSpeed_ProcessInput(u8 selection) sArrowPressed = TRUE; } - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { if (selection != 0) selection--; @@ -451,7 +451,7 @@ static void TextSpeed_DrawChoices(u8 selection) static u8 BattleScene_ProcessInput(u8 selection) { - if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (JOY_NEW(DPAD_LEFT | DPAD_RIGHT)) { selection ^= 1; sArrowPressed = TRUE; @@ -474,7 +474,7 @@ static void BattleScene_DrawChoices(u8 selection) static u8 BattleStyle_ProcessInput(u8 selection) { - if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (JOY_NEW(DPAD_LEFT | DPAD_RIGHT)) { selection ^= 1; sArrowPressed = TRUE; @@ -497,7 +497,7 @@ static void BattleStyle_DrawChoices(u8 selection) static u8 Sound_ProcessInput(u8 selection) { - if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (JOY_NEW(DPAD_LEFT | DPAD_RIGHT)) { selection ^= 1; SetPokemonCryStereo(selection); @@ -521,7 +521,7 @@ static void Sound_DrawChoices(u8 selection) static u8 FrameType_ProcessInput(u8 selection) { - if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) { if (selection < WINDOW_FRAMES_COUNT - 1) selection++; @@ -532,7 +532,7 @@ static u8 FrameType_ProcessInput(u8 selection) LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20); sArrowPressed = TRUE; } - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { if (selection != 0) selection--; @@ -579,7 +579,7 @@ static void FrameType_DrawChoices(u8 selection) static u8 ButtonMode_ProcessInput(u8 selection) { - if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) { if (selection <= 1) selection++; @@ -588,7 +588,7 @@ static u8 ButtonMode_ProcessInput(u8 selection) sArrowPressed = TRUE; } - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { if (selection != 0) selection--; diff --git a/src/overworld.c b/src/overworld.c index 2d838fc4d6..2d798f2ec7 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1076,11 +1076,11 @@ u16 GetLocationMusic(struct WarpData *warp) if (NoMusicInSotopolisWithLegendaries(warp) == TRUE) return 0xFFFF; else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) - return MUS_OOAME; + return MUS_ABNORMAL_WEATHER; else if (IsInflitratedSpaceCenter(warp) == TRUE) - return MUS_MGM0; + return MUS_ENCOUNTER_MAGMA; else if (IsInfiltratedWeatherInstitute(warp) == TRUE) - return MUS_TOZAN; + return MUS_MT_CHIMNEY; else return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music; } @@ -1093,26 +1093,26 @@ u16 GetCurrLocationDefaultMusic(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111) && GetSav1Weather() == WEATHER_SANDSTORM) - return MUS_ASHROAD; + return MUS_ROUTE111; music = GetLocationMusic(&gSaveBlock1Ptr->location); - if (music != MUS_ROUTE_118) + if (music != MUS_ROUTE118) { return music; } else { if (gSaveBlock1Ptr->pos.x < 24) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } u16 GetWarpDestinationMusic(void) { u16 music = GetLocationMusic(&sWarpDestination); - if (music != MUS_ROUTE_118) + if (music != MUS_ROUTE118) { return music; } @@ -1120,9 +1120,9 @@ u16 GetWarpDestinationMusic(void) { if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAUVILLE_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAUVILLE_CITY)) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } @@ -1135,14 +1135,14 @@ void Overworld_PlaySpecialMapMusic(void) { u16 music = GetCurrLocationDefaultMusic(); - if (music != MUS_OOAME && music != 0xFFFF) + if (music != MUS_ABNORMAL_WEATHER && music != 0xFFFF) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; else if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) - music = MUS_DEEPDEEP; + music = MUS_UNDERWATER; else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - music = MUS_NAMINORI; + music = MUS_SURF; } if (music != GetCurrentMapMusic()) @@ -1165,12 +1165,12 @@ static void TransitionMapMusic(void) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); - if (newMusic != MUS_OOAME && newMusic != 0xFFFF) + if (newMusic != MUS_ABNORMAL_WEATHER && newMusic != 0xFFFF) { - if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) + if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF) return; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - newMusic = MUS_NAMINORI; + newMusic = MUS_SURF; } if (newMusic != currentMusic) { @@ -1192,7 +1192,7 @@ void Overworld_ChangeMusicToDefault(void) void Overworld_ChangeMusicTo(u16 newMusic) { u16 currentMusic = GetCurrentMapMusic(); - if (currentMusic != newMusic && currentMusic != MUS_OOAME) + if (currentMusic != newMusic && currentMusic != MUS_ABNORMAL_WEATHER) FadeOutAndPlayNewMapMusic(newMusic, 8); } @@ -1211,7 +1211,7 @@ void TryFadeOutOldMapMusic(void) u16 warpMusic = GetWarpDestinationMusic(); if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && warpMusic != GetCurrentMapMusic()) { - if (currentMusic == MUS_NAMINORI + if (currentMusic == MUS_SURF && VarGet(VAR_SKY_PILLAR_STATE) == 2 && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY) @@ -2454,20 +2454,19 @@ static void UpdateHeldKeyCode(u16 key) static u16 KeyInterCB_ReadButtons(u32 key) { - if (gMain.heldKeys & DPAD_UP) + if (JOY_HELD(DPAD_UP)) return LINK_KEY_CODE_DPAD_UP; - else if (gMain.heldKeys & DPAD_DOWN) + if (JOY_HELD(DPAD_DOWN)) return LINK_KEY_CODE_DPAD_DOWN; - else if (gMain.heldKeys & DPAD_LEFT) + if (JOY_HELD(DPAD_LEFT)) return LINK_KEY_CODE_DPAD_LEFT; - else if (gMain.heldKeys & DPAD_RIGHT) + if (JOY_HELD(DPAD_RIGHT)) return LINK_KEY_CODE_DPAD_RIGHT; - else if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) return LINK_KEY_CODE_START_BUTTON; - else if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) return LINK_KEY_CODE_A_BUTTON; - else - return LINK_KEY_CODE_EMPTY; + return LINK_KEY_CODE_EMPTY; } static u16 GetDirectionForDpadKey(u16 a1) @@ -2574,7 +2573,7 @@ static u16 sub_8087170(u32 keyOrPlayerId) { if (sPlayerTradingStates[keyOrPlayerId] == PLAYER_TRADING_STATE_UNK_2) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { SetKeyInterceptCallback(KeyInterCB_DoNothingAndKeepAlive); return LINK_KEY_CODE_UNK_7; diff --git a/src/palette.c b/src/palette.c index eb49ce4c60..320e11ecc3 100644 --- a/src/palette.c +++ b/src/palette.c @@ -52,7 +52,7 @@ static u8 UpdateFastPaletteFade(void); static u8 UpdateHardwarePaletteFade(void); static void UpdateBlendRegisters(void); static bool8 IsSoftwarePaletteFadeFinishing(void); -static void sub_80A2D54(u8 taskId); +static void Task_BlendPalettesGradually(u8 taskId); // palette buffers require alignment with agbcc because // unaligned word reads are issued in BlendPalette otherwise @@ -940,91 +940,105 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b } } -void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7) +#define tCoeff data[0] +#define tCoeffTarget data[1] +#define tCoeffDelta data[2] +#define tDelay data[3] +#define tDelayTimer data[4] +#define tPalettes 5 // data[5] and data[6], set/get via Set/GetWordTaskArg +#define tColor data[7] +#define tId data[8] + +// Blend the selected palettes in a series of steps toward or away from the color. +// Only used by the Groudon/Kyogre fight scene to flash the screen for lightning +// One call is used to fade the bg from white, while another fades the duo from black +void BlendPalettesGradually(u32 selectedPalettes, s8 delay, u8 coeff, u8 coeffTarget, u16 color, u8 priority, u8 id) { u8 taskId; - taskId = CreateTask((void *)sub_80A2D54, a6); - gTasks[taskId].data[0] = a3; - gTasks[taskId].data[1] = a4; + taskId = CreateTask((void *)Task_BlendPalettesGradually, priority); + gTasks[taskId].tCoeff = coeff; + gTasks[taskId].tCoeffTarget = coeffTarget; - if (a2 >= 0) + if (delay >= 0) { - gTasks[taskId].data[3] = a2; - gTasks[taskId].data[2] = 1; + gTasks[taskId].tDelay = delay; + gTasks[taskId].tCoeffDelta = 1; } else { - gTasks[taskId].data[3] = 0; - gTasks[taskId].data[2] = -a2 + 1; + gTasks[taskId].tDelay = 0; + gTasks[taskId].tCoeffDelta = -delay + 1; } - if (a4 < a3) - gTasks[taskId].data[2] *= -1; + if (coeffTarget < coeff) + gTasks[taskId].tCoeffDelta *= -1; - SetWordTaskArg(taskId, 5, a1); - gTasks[taskId].data[7] = a5; - gTasks[taskId].data[8] = a7; + SetWordTaskArg(taskId, tPalettes, selectedPalettes); + gTasks[taskId].tColor = color; + gTasks[taskId].tId = id; gTasks[taskId].func(taskId); } -bool32 sub_80A2CF8(u8 var) +// Unused +static bool32 IsBlendPalettesGraduallyTaskActive(u8 id) { int i; - for (i = 0; i < NUM_TASKS; i++) // check all the tasks. - if ((gTasks[i].isActive == TRUE) && (gTasks[i].func == sub_80A2D54) && (gTasks[i].data[8] == var)) + for (i = 0; i < NUM_TASKS; i++) + if ((gTasks[i].isActive == TRUE) + && (gTasks[i].func == Task_BlendPalettesGradually) + && (gTasks[i].tId == id)) return TRUE; return FALSE; } -void sub_80A2D34(void) +// Unused +static void DestroyBlendPalettesGraduallyTask(void) { u8 taskId; while (1) { - taskId = FindTaskIdByFunc(sub_80A2D54); + taskId = FindTaskIdByFunc(Task_BlendPalettesGradually); if (taskId == 0xFF) break; DestroyTask(taskId); } } -void sub_80A2D54(u8 taskId) +static void Task_BlendPalettesGradually(u8 taskId) { - u32 wordVar; + u32 palettes; s16 *data; - s16 temp; + s16 target; data = gTasks[taskId].data; - wordVar = GetWordTaskArg(taskId, 5); + palettes = GetWordTaskArg(taskId, tPalettes); - if (++data[4] > data[3]) + if (++tDelayTimer > tDelay) { - data[4] = 0; - BlendPalettes(wordVar, data[0], data[7]); - temp = data[1]; - if (data[0] == temp) + tDelayTimer = 0; + BlendPalettes(palettes, tCoeff, tColor); + target = tCoeffTarget; + if (tCoeff == target) { DestroyTask(taskId); } else { - data[0] += data[2]; - if (data[2] >= 0) + tCoeff += tCoeffDelta; + if (tCoeffDelta >= 0) { - if (data[0] < temp) - { + if (tCoeff < target) return; - } } - else if (data[0] > temp) + else if (tCoeff > target) { return; } - data[0] = temp; + tCoeff = target; } } } diff --git a/src/party_menu.c b/src/party_menu.c index f61cbc5e6e..e509ef6e09 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1294,7 +1294,7 @@ static bool8 IsSelectedMonNotEgg(u8 *slotPtr) { if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return FALSE; } return TRUE; @@ -1305,7 +1305,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr) switch (gPartyMenu.action) { case PARTY_ACTION_SEND_OUT: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; case PARTY_ACTION_SWITCH: case PARTY_ACTION_SOFTBOILED: @@ -1411,7 +1411,7 @@ static u16 PartyMenuButtonHandler(s8 *slotPtr) break; } - if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) return 8; if (movementDir) @@ -1421,10 +1421,10 @@ static u16 PartyMenuButtonHandler(s8 *slotPtr) } // Pressed Cancel - if ((gMain.newKeys & A_BUTTON) && *slotPtr == PARTY_SIZE + 1) + if ((JOY_NEW(A_BUTTON)) && *slotPtr == PARTY_SIZE + 1) return 2; - return gMain.newKeys & (A_BUTTON | B_BUTTON); + return JOY_NEW(A_BUTTON | B_BUTTON); } static void UpdateCurrentPartySelection(s8 *slotPtr, s8 movementDir) @@ -1915,7 +1915,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; @@ -3471,7 +3471,7 @@ static void CursorCb_Enter(u8 taskId) } ConvertIntToDecimalStringN(gStringVar1, maxBattlers, STR_CONV_MODE_LEFT_ALIGN, 1); StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn); - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuMessage(gStringVar4, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } @@ -3538,7 +3538,7 @@ static void CursorCb_Register(u8 taskId) Task_ClosePartyMenu(taskId); return; } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); StringAppend(gStringVar4, gText_PauseUntilPress); @@ -3556,7 +3556,7 @@ static void CursorCb_Trade1(u8 taskId) if (stringId != UR_TRADE_MSG_NONE) { StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]); - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); StringAppend(gStringVar4, gText_PauseUntilPress); @@ -3595,7 +3595,7 @@ static void CursorCb_Trade2(u8 taskId) gTasks[taskId].func = Task_SpinTradeYesNo; return; } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); StringAppend(gStringVar4, gText_PauseUntilPress); DisplayPartyMenuMessage(gStringVar4, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; @@ -3765,7 +3765,7 @@ static u16 GetFieldMoveMonSpecies(void) static void Task_CancelAfterAorBPress(u8 taskId) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) CursorCb_Cancel1(taskId); } @@ -4355,13 +4355,13 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task) gPartyMenuUseExitCallback = TRUE; if (!IsItemFlute(item)) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM) RemoveBagItem(item, 1); } else { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); } SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]); if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible) @@ -4426,7 +4426,7 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task) else { gPartyMenuUseExitCallback = TRUE; - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(item, 1); GetMonNickname(mon, gStringVar1); ItemEffectToStatString(effectType, gStringVar2); @@ -4591,7 +4591,7 @@ static void TryUsePPItem(u8 taskId) { gPartyMenuUseExitCallback = TRUE; mon = &gPlayerParty[ptr->slotId]; - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(item, 1); move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot); StringCopy(gStringVar1, gMoveNames[move]); @@ -4715,14 +4715,14 @@ static void Task_DoLearnedMoveFanfareAfterText(u8 taskId) { if (IsPartyMenuTextPrinterActive() != TRUE) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu; } } static void Task_LearnNextMoveOrClosePartyMenu(u8 taskId) { - if (IsFanfareTaskInactive() && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))) + if (IsFanfareTaskInactive() && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) { if (gPartyMenu.learnMoveState == 1) Task_TryLearningNextMove(taskId); @@ -4931,7 +4931,7 @@ static void UpdateMonDisplayInfoAfterRareCandy(u8 slot, struct Pokemon *mon) static void Task_DisplayLevelUpStatsPg1(u8 taskId) { - if (WaitFanfare(FALSE) && IsPartyMenuTextPrinterActive() != TRUE && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))) + if (WaitFanfare(FALSE) && IsPartyMenuTextPrinterActive() != TRUE && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) { PlaySE(SE_SELECT); DisplayLevelUpStatsPg1(taskId); @@ -4941,7 +4941,7 @@ static void Task_DisplayLevelUpStatsPg1(u8 taskId) static void Task_DisplayLevelUpStatsPg2(u8 taskId) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) { PlaySE(SE_SELECT); DisplayLevelUpStatsPg2(taskId); @@ -4972,7 +4972,7 @@ static void Task_TryLearnNewMoves(u8 taskId) { u16 learnMove; - if (WaitFanfare(0) && ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))) + if (WaitFanfare(0) && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) { RemoveLevelUpStatsWindow(); learnMove = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], TRUE); @@ -5095,7 +5095,7 @@ static void UseSacredAsh(u8 taskId) return; } - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]); if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible) DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[gPartyMenu.slotId], 1); @@ -5596,7 +5596,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId) if (msgId != 0xFF) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuStdMessage(msgId); gTasks[taskId].func = Task_ContinueChoosingHalfParty; } @@ -5609,7 +5609,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId) static void Task_ContinueChoosingHalfParty(u8 taskId) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) { PlaySE(SE_SELECT); DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON); @@ -6077,7 +6077,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId) if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE) AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0); } - PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen + PlaySE(SE_M_HARDEN); // The Harden SE plays once the partners party mons have slid on screen gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn; } } diff --git a/src/player_pc.c b/src/player_pc.c index 2010d84f85..238424ee33 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1134,7 +1134,7 @@ static void ItemStorage_ProcessInput(u8 taskId) s32 id; data = gTasks[taskId].data; - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); if ((playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos) != (playerPCItemPageInfo.count - 1)) @@ -1212,7 +1212,7 @@ static void sub_816C4FC(u8 taskId) s32 id; data = gTasks[taskId].data; - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); ItemStorage_DoItemSwap(taskId, FALSE); @@ -1227,7 +1227,7 @@ static void sub_816C4FC(u8 taskId) case LIST_NOTHING_CHOSEN: break; case LIST_CANCEL: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { ItemStorage_DoItemSwap(taskId, FALSE); } @@ -1332,7 +1332,7 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) sub_816C6BC(sub_816BC7C(4), data[2], STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3); else { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sub_816BCC4(4); @@ -1341,7 +1341,7 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) else ItemStorage_DoItemToss(taskId); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); sub_816BCC4(4); @@ -1412,7 +1412,7 @@ static void ItemStorage_HandleRemoveItem(u8 taskId) s16 *data; data = gTasks[taskId].data; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { RemovePCItem((playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove), data[2]); DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); @@ -1429,7 +1429,7 @@ static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId) s16 *data; data = gTasks[taskId].data; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(gSaveBlock1Ptr->pcItems[(playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos)].itemId)); ItemStorage_StartScrollIndicatorAndProcessInput(taskId); diff --git a/src/pokeball.c b/src/pokeball.c index 1a0561c33a..b176677bd3 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -166,43 +166,43 @@ static const union AnimCmd *const sBallAnimSequences[] = sBallAnimSeq6, }; -static const union AffineAnimCmd sBallAffineAnimSeq0[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_0[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq1[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_Right[] = { AFFINEANIMCMD_FRAME(0, 0, -3, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq2[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_Left[] = { AFFINEANIMCMD_FRAME(0, 0, 3, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq3[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_3[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd sBallAffineAnimSeq4[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_4[] = { AFFINEANIMCMD_FRAME(0, 0, 25, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const sBallAffineAnimSequences[] = +static const union AffineAnimCmd *const sAffineAnim_BallRotate[] = { - sBallAffineAnimSeq0, - sBallAffineAnimSeq1, - sBallAffineAnimSeq2, - sBallAffineAnimSeq3, - sBallAffineAnimSeq4, + [BALL_AFFINE_ANIM_0] = sAffineAnim_BallRotate_0, + [BALL_ROTATE_RIGHT] = sAffineAnim_BallRotate_Right, + [BALL_ROTATE_LEFT] = sAffineAnim_BallRotate_Left, + [BALL_AFFINE_ANIM_3] = sAffineAnim_BallRotate_3, + [BALL_AFFINE_ANIM_4] = sAffineAnim_BallRotate_4, }; const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = @@ -213,7 +213,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -222,7 +222,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -231,7 +231,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -240,7 +240,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -249,7 +249,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -258,7 +258,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -267,7 +267,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -276,7 +276,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -285,7 +285,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -294,7 +294,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -303,7 +303,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, { @@ -312,7 +312,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, + .affineAnims = sAffineAnim_BallRotate, .callback = SpriteCB_TestBallThrow, }, }; @@ -406,7 +406,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) gSprites[ballSpriteId].oam.affineParam = taskId; gTasks[taskId].tOpponentBattler = gBattlerTarget; gTasks[taskId].func = TaskDummy; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); } static void SpriteCB_TestBallThrow(struct Sprite *sprite) @@ -446,6 +446,7 @@ static void sub_80756D4(struct Sprite *sprite) sprite->callback = sub_80756E0; } +// Start something for battler static void sub_80756E0(struct Sprite *sprite) { if (++sprite->data[5] == 10) @@ -458,11 +459,12 @@ static void sub_80756E0(struct Sprite *sprite) } } +// Shrink player static void sub_807574C(struct Sprite *sprite) { sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded) { StartSpriteAnim(sprite, 2); @@ -512,16 +514,16 @@ static void sub_8075838(struct Sprite *sprite) switch (sprite->data[3] >> 8) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } @@ -563,7 +565,7 @@ static void sub_8075930(struct Sprite *sprite) sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_8075970; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -632,7 +634,7 @@ static void sub_8075970(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -738,7 +740,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) StartSpriteAnim(sprite, 1); ballId = ItemIdToBallId(GetBattlerPokeballItemId(battlerId)); AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId); - sprite->data[0] = LaunchBallFadeMonTask(1, sprite->sBattler, 14, ballId); + sprite->data[0] = LaunchBallFadeMonTask(TRUE, sprite->sBattler, 14, ballId); sprite->callback = HandleBallAnimEnd; if (gMain.inBattle) @@ -879,7 +881,7 @@ static void sub_80760F8(struct Sprite *sprite) { gDoingBattleAnim = FALSE; m4aMPlayAllStop(); - PlaySE(MUS_FANFA5); + PlaySE(MUS_EVOLVED); } else if (sprite->data[4] == 315) { @@ -1148,7 +1150,7 @@ static void sub_807687C(struct Sprite *sprite) sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); r1 = sprite->data[0]; if (gSprites[r1].affineAnimEnded) { diff --git a/src/pokeblock.c b/src/pokeblock.c index 025adf875f..b44112b886 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -180,21 +180,21 @@ static const struct BgTemplate sBgTemplatesForPokeblockMenu[] = const u8 *const gPokeblockNames[] = { - NULL, - gText_RedPokeblock, - gText_BluePokeblock, - gText_PinkPokeblock, - gText_GreenPokeblock, - gText_YellowPokeblock, - gText_PurplePokeblock, - gText_IndigoPokeblock, - gText_BrownPokeblock, - gText_LiteBluePokeblock, - gText_OlivePokeblock, - gText_GrayPokeblock, - gText_BlackPokeblock, - gText_WhitePokeblock, - gText_GoldPokeblock + [PBLOCK_CLR_NONE] = NULL, + [PBLOCK_CLR_RED] = gText_RedPokeblock, + [PBLOCK_CLR_BLUE] = gText_BluePokeblock, + [PBLOCK_CLR_PINK] = gText_PinkPokeblock, + [PBLOCK_CLR_GREEN] = gText_GreenPokeblock, + [PBLOCK_CLR_YELLOW] = gText_YellowPokeblock, + [PBLOCK_CLR_PURPLE] = gText_PurplePokeblock, + [PBLOCK_CLR_INDIGO] = gText_IndigoPokeblock, + [PBLOCK_CLR_BROWN] = gText_BrownPokeblock, + [PBLOCK_CLR_LITE_BLUE] = gText_LiteBluePokeblock, + [PBLOCK_CLR_OLIVE] = gText_OlivePokeblock, + [PBLOCK_CLR_GRAY] = gText_GrayPokeblock, + [PBLOCK_CLR_BLACK] = gText_BlackPokeblock, + [PBLOCK_CLR_WHITE] = gText_WhitePokeblock, + [PBLOCK_CLR_GOLD] = gText_GoldPokeblock }; static const struct MenuAction sPokeblockMenuActions[] = @@ -430,7 +430,7 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate = // code void OpenPokeblockCase(u8 caseId, void (*callback)(void)) { - sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); + sPokeblockMenu = Alloc(sizeof(struct PokeblockMenuStruct)); sPokeblockMenu->caseId = caseId; sPokeblockMenu->callbackOnUse = NULL; sPokeblockMenu->unkTaskId = 0xFF; @@ -726,7 +726,7 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId) *(txtPtr++) = EXT_CTRL_CODE_BEGIN; *(txtPtr++) = EXT_CTRL_CODE_SKIP; - *(txtPtr++) = 87; + *(txtPtr++) = CHAR_BLOCK_1; ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(txtPtr, gText_LvVar1); @@ -804,7 +804,7 @@ static void CompactPokeblockSlots(void) { for (j = i + 1; j < POKEBLOCKS_COUNT; j++) { - if (gSaveBlock1Ptr->pokeblocks[i].color == 0) + if (gSaveBlock1Ptr->pokeblocks[i].color == PBLOCK_CLR_NONE) { struct Pokeblock temp = gSaveBlock1Ptr->pokeblocks[i]; gSaveBlock1Ptr->pokeblocks[i] = gSaveBlock1Ptr->pokeblocks[j]; @@ -856,7 +856,7 @@ static void SetMenuItemsCountAndMaxShowed(void) for (sPokeblockMenu->itemsNo = 0, i = 0; i < POKEBLOCKS_COUNT; i++) { - if (gSaveBlock1Ptr->pokeblocks[i].color != 0) + if (gSaveBlock1Ptr->pokeblocks[i].color != PBLOCK_CLR_NONE) sPokeblockMenu->itemsNo++; } @@ -984,7 +984,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) if (!gPaletteFade.active && MenuHelpers_CallLinkSomething() != TRUE) { - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1) @@ -1035,7 +1035,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId) if (MenuHelpers_CallLinkSomething() == TRUE) return; - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { PlaySE(SE_SELECT); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); @@ -1069,7 +1069,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId) break; case LIST_CANCEL: // same id as STOW CASE field PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) HandlePokeblocksSwap(taskId, FALSE); else HandlePokeblocksSwap(taskId, TRUE); @@ -1193,7 +1193,7 @@ static void TossPokeblockChoice_Yes(u8 taskId) static void HandleErasePokeblock(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { s16 *data; u16 *lastPage, *lastPos; @@ -1322,7 +1322,7 @@ s8 GetFirstFreePokeblockSlot(void) for (i = 0; i < POKEBLOCKS_COUNT; i++) { - if (gSaveBlock1Ptr->pokeblocks[i].color == 0) + if (gSaveBlock1Ptr->pokeblocks[i].color == PBLOCK_CLR_NONE) return i; } @@ -1346,7 +1346,7 @@ bool32 AddPokeblock(const struct Pokeblock *pokeblock) bool32 TryClearPokeblock(u8 pkblId) { - if (gSaveBlock1Ptr->pokeblocks[pkblId].color == 0) + if (gSaveBlock1Ptr->pokeblocks[pkblId].color == PBLOCK_CLR_NONE) { return FALSE; } diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index e15a005e6d..797771f800 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -382,22 +382,23 @@ static const struct WindowTemplate sWindowTemplates[] = DUMMY_WIN_TEMPLATE }; +// - 1 excludes PBLOCK_CLR_NONE static const u32* const sPokeblocksPals[] = { - gPokeblockRed_Pal, - gPokeblockBlue_Pal, - gPokeblockPink_Pal, - gPokeblockGreen_Pal, - gPokeblockYellow_Pal, - gPokeblockPurple_Pal, - gPokeblockIndigo_Pal, - gPokeblockBrown_Pal, - gPokeblockLiteBlue_Pal, - gPokeblockOlive_Pal, - gPokeblockGray_Pal, - gPokeblockBlack_Pal, - gPokeblockWhite_Pal, - gPokeblockGold_Pal + [PBLOCK_CLR_RED - 1] = gPokeblockRed_Pal, + [PBLOCK_CLR_BLUE - 1] = gPokeblockBlue_Pal, + [PBLOCK_CLR_PINK - 1] = gPokeblockPink_Pal, + [PBLOCK_CLR_GREEN - 1] = gPokeblockGreen_Pal, + [PBLOCK_CLR_YELLOW - 1] = gPokeblockYellow_Pal, + [PBLOCK_CLR_PURPLE - 1] = gPokeblockPurple_Pal, + [PBLOCK_CLR_INDIGO - 1] = gPokeblockIndigo_Pal, + [PBLOCK_CLR_BROWN - 1] = gPokeblockBrown_Pal, + [PBLOCK_CLR_LITE_BLUE - 1] = gPokeblockLiteBlue_Pal, + [PBLOCK_CLR_OLIVE - 1] = gPokeblockOlive_Pal, + [PBLOCK_CLR_GRAY - 1] = gPokeblockGray_Pal, + [PBLOCK_CLR_BLACK - 1] = gPokeblockBlack_Pal, + [PBLOCK_CLR_WHITE - 1] = gPokeblockWhite_Pal, + [PBLOCK_CLR_GOLD - 1] = gPokeblockGold_Pal }; static const union AffineAnimCmd sSpriteAffineAnim_84120DC[] = diff --git a/src/pokedex.c b/src/pokedex.c index fac1f03acc..f3e0e0a066 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -172,16 +172,16 @@ struct PokedexView u16 ownCount; u16 monSpriteIds[MAX_MONS_ON_SCREEN]; u16 selectedMonSpriteId; - u16 pokeBallRotationStep; - u16 pokeBallRotationBackup; + s16 pokeBallRotationStep; + s16 pokeBallRotationBackup; u8 pokeBallRotation; u8 initialVOffset; u8 scrollTimer; u8 scrollDirection; s16 listVOffset; s16 listMovingVOffset; - u16 scrollMonIncrement; - u16 maxScrollTimer; + s16 scrollMonIncrement; + s16 maxScrollTimer; u16 scrollSpeed; u16 unkArr1[4]; // Cleared, never read u8 filler[8]; @@ -1671,7 +1671,7 @@ static void Task_HandlePokedexInput(u8 taskId) } else { - if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) + if ((JOY_NEW(A_BUTTON)) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) { UpdateSelectedMonSpriteId(); BeginNormalPaletteFade(~(1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK); @@ -1680,7 +1680,7 @@ static void Task_HandlePokedexInput(u8 taskId) PlaySE(SE_PIN); FreeWindowAndBgBuffers(); } - else if (gMain.newKeys & START_BUTTON) + else if (JOY_NEW(START_BUTTON)) { sPokedexView->menuY = 0; sPokedexView->menuIsOpen = TRUE; @@ -1688,7 +1688,7 @@ static void Task_HandlePokedexInput(u8 taskId) gTasks[taskId].func = Task_HandlePokedexStartMenuInput; PlaySE(SE_SELECT); } - else if (gMain.newKeys & SELECT_BUTTON) + else if (JOY_NEW(SELECT_BUTTON)) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); @@ -1702,7 +1702,7 @@ static void Task_HandlePokedexInput(u8 taskId) PlaySE(SE_PC_LOGIN); FreeWindowAndBgBuffers(); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedex; @@ -1735,7 +1735,7 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId) } else { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sPokedexView->menuCursorPos) { @@ -1766,18 +1766,18 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId) } //Exit menu when Start or B is pressed - if (gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (JOY_NEW(START_BUTTON | B_BUTTON)) { sPokedexView->menuIsOpen = FALSE; gTasks[taskId].func = Task_HandlePokedexInput; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos != 0) + else if ((JOY_REPEAT(DPAD_UP)) && sPokedexView->menuCursorPos != 0) { sPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos < 3) + else if ((JOY_REPEAT(DPAD_DOWN)) && sPokedexView->menuCursorPos < 3) { sPokedexView->menuCursorPos++; PlaySE(SE_SELECT); @@ -1871,7 +1871,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) } else { - if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) + if ((JOY_NEW(A_BUTTON)) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) { u32 a; @@ -1883,7 +1883,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) PlaySE(SE_PIN); FreeWindowAndBgBuffers(); } - else if (gMain.newKeys & START_BUTTON) + else if (JOY_NEW(START_BUTTON)) { sPokedexView->menuY = 0; sPokedexView->menuIsOpen = TRUE; @@ -1891,7 +1891,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) gTasks[taskId].func = Task_HandleSearchResultsStartMenuInput; PlaySE(SE_SELECT); } - else if (gMain.newKeys & SELECT_BUTTON) + else if (JOY_NEW(SELECT_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].tTaskId = LoadSearchMenu(); @@ -1900,7 +1900,7 @@ static void Task_HandleSearchResultsInput(u8 taskId) PlaySE(SE_PC_LOGIN); FreeWindowAndBgBuffers(); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults; @@ -1932,7 +1932,7 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId) } else { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sPokedexView->menuCursorPos) { @@ -1957,7 +1957,7 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults; - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); @@ -1968,18 +1968,18 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId) } //Exit menu when Start or B is pressed - if (gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (JOY_NEW(START_BUTTON | B_BUTTON)) { sPokedexView->menuIsOpen = FALSE; gTasks[taskId].func = Task_HandleSearchResultsInput; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos) + else if ((JOY_REPEAT(DPAD_UP)) && sPokedexView->menuCursorPos) { sPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos < 4) + else if ((JOY_REPEAT(DPAD_DOWN)) && sPokedexView->menuCursorPos < 4) { sPokedexView->menuCursorPos++; PlaySE(SE_SELECT); @@ -2058,10 +2058,10 @@ static bool8 LoadPokedexListPage(u8 page) SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sPokedex_BgTemplate, ARRAY_COUNT(sPokedex_BgTemplate)); - SetBgTilemapBuffer(3, AllocZeroed(0x800)); - SetBgTilemapBuffer(2, AllocZeroed(0x800)); - SetBgTilemapBuffer(1, AllocZeroed(0x800)); - SetBgTilemapBuffer(0, AllocZeroed(0x800)); + SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(1, gPokedexList_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, gPokedexListUnderlay_Tilemap, 0, 0); @@ -2588,23 +2588,23 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) u16 startingPos; u8 scrollDir = 0; - if ((gMain.heldKeys & DPAD_UP) && (selectedMon > 0)) + if ((JOY_HELD(DPAD_UP)) && (selectedMon > 0)) { scrollDir = 1; selectedMon = GetNextPosition(1, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateScrollingPokemonSprite(1, selectedMon); CreateMonListEntry(1, selectedMon, ignored); - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); } - else if ((gMain.heldKeys & DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1)) + else if (JOY_HELD(DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1)) { scrollDir = 2; selectedMon = GetNextPosition(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateScrollingPokemonSprite(2, selectedMon); CreateMonListEntry(2, selectedMon, ignored); - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); } - else if ((gMain.newKeys & DPAD_LEFT) && (selectedMon > 0)) + else if (JOY_NEW(DPAD_LEFT) && (selectedMon > 0)) { startingPos = selectedMon; @@ -2613,9 +2613,9 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos); ClearMonSprites(); CreateMonSpritesAtPos(selectedMon, 0xE); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } - else if ((gMain.newKeys & DPAD_RIGHT) && (selectedMon < sPokedexView->pokemonListCount - 1)) + else if ((JOY_NEW(DPAD_RIGHT)) && (selectedMon < sPokedexView->pokemonListCount - 1)) { startingPos = selectedMon; for (i = 0; i < 7; i++) @@ -2623,7 +2623,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored) sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos); ClearMonSprites(); CreateMonSpritesAtPos(selectedMon, 0xE); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } if (scrollDir == 0) @@ -2664,7 +2664,7 @@ static bool8 TryDoInfoScreenScroll(void) u16 nextPokemon; u16 selectedPokemon = sPokedexView->selectedPokemon; - if ((gMain.newKeys & DPAD_UP) && selectedPokemon) + if ((JOY_NEW(DPAD_UP)) && selectedPokemon) { nextPokemon = selectedPokemon; while (nextPokemon != 0) @@ -2687,7 +2687,7 @@ static bool8 TryDoInfoScreenScroll(void) return TRUE; } } - else if ((gMain.newKeys & DPAD_DOWN) && selectedPokemon < sPokedexView->pokemonListCount - 1) + else if ((JOY_NEW(DPAD_DOWN)) && selectedPokemon < sPokedexView->pokemonListCount - 1) { nextPokemon = selectedPokemon; while (nextPokemon < sPokedexView->pokemonListCount - 1) @@ -3184,10 +3184,10 @@ static u8 LoadInfoScreen(struct PokedexListItem* item, u8 monSpriteId) gTasks[taskId].data[5] = 255; ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sInfoScreen_BgTemplate, ARRAY_COUNT(sInfoScreen_BgTemplate)); - SetBgTilemapBuffer(3, AllocZeroed(0x800)); - SetBgTilemapBuffer(2, AllocZeroed(0x800)); - SetBgTilemapBuffer(1, AllocZeroed(0x800)); - SetBgTilemapBuffer(0, AllocZeroed(0x800)); + SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); InitWindows(sInfoScreen_WindowTemplates); DeactivateAllTextPrinters(); @@ -3351,17 +3351,17 @@ static void Task_HandleInfoScreenInput(u8 taskId) // Scroll up/down BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_LoadInfoScreenWaitForFade; - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); return; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ExitInfoScreen; PlaySE(SE_PC_OFF); return; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sPokedexView->selectedScreen) { @@ -3380,7 +3380,7 @@ static void Task_HandleInfoScreenInput(u8 taskId) case SIZE_SCREEN: if (!sPokedexListItem->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3398,22 +3398,22 @@ static void Task_HandleInfoScreenInput(u8 taskId) } return; } - if (((gMain.newKeys & DPAD_LEFT) - || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + if ((JOY_NEW(DPAD_LEFT) + || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) && sPokedexView->selectedScreen > 0) { sPokedexView->selectedScreen--; HighlightScreenSelectBarItem(sPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } - if (((gMain.newKeys & DPAD_RIGHT) - || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + if ((JOY_NEW(DPAD_RIGHT) + || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) && sPokedexView->selectedScreen < CANCEL_SCREEN) { sPokedexView->selectedScreen++; HighlightScreenSelectBarItem(sPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } } @@ -3628,7 +3628,7 @@ static void Task_HandleCryScreenInput(u8 taskId) else LoadPlayArrowPalette(FALSE); - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { LoadPlayArrowPalette(TRUE); CryScreenPlayButton(NationalPokedexNumToSpecies(sPokedexListItem->dexNum)); @@ -3636,7 +3636,7 @@ static void Task_HandleCryScreenInput(u8 taskId) } else if (!gPaletteFade.active) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); m4aMPlayContinue(&gMPlayInfo_BGM); @@ -3645,22 +3645,22 @@ static void Task_HandleCryScreenInput(u8 taskId) PlaySE(SE_PC_OFF); return; } - if ((gMain.newKeys & DPAD_LEFT) - || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + if ((JOY_NEW(DPAD_LEFT)) + || ((JOY_NEW(L_BUTTON)) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); m4aMPlayContinue(&gMPlayInfo_BGM); sPokedexView->screenSwitchState = 2; gTasks[taskId].func = Task_SwitchScreensFromCryScreen; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } - if ((gMain.newKeys & DPAD_RIGHT) - || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + if (JOY_NEW(DPAD_RIGHT) + || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { if (!sPokedexListItem->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3668,7 +3668,7 @@ static void Task_HandleCryScreenInput(u8 taskId) m4aMPlayContinue(&gMPlayInfo_BGM); sPokedexView->screenSwitchState = 3; gTasks[taskId].func = Task_SwitchScreensFromCryScreen; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } return; } @@ -3808,20 +3808,20 @@ static void Task_LoadSizeScreen(u8 taskId) static void Task_HandleSizeScreenInput(u8 taskId) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); sPokedexView->screenSwitchState = 1; gTasks[taskId].func = Task_SwitchScreensFromSizeScreen; PlaySE(SE_PC_OFF); } - else if ((gMain.newKeys & DPAD_LEFT) - || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + else if ((JOY_NEW(DPAD_LEFT)) + || ((JOY_NEW(L_BUTTON)) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); sPokedexView->screenSwitchState = 2; gTasks[taskId].func = Task_SwitchScreensFromSizeScreen; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } } @@ -3949,8 +3949,8 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId) ResetOtherVideoRegisters(DISPCNT_BG0_ON); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sNewEntryInfoScreen_BgTemplate, ARRAY_COUNT(sNewEntryInfoScreen_BgTemplate)); - SetBgTilemapBuffer(3, AllocZeroed(0x800)); - SetBgTilemapBuffer(2, AllocZeroed(0x800)); + SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE)); InitWindows(sNewEntryInfoScreen_WindowTemplates); DeactivateAllTextPrinters(); gTasks[taskId].tState = 1; @@ -4008,7 +4008,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId) static void Task_HandleCaughtMonPageInput(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(0x0000FFFF, 0, 0, 16, RGB_BLACK); gSprites[gTasks[taskId].tMonSpriteId].callback = SpriteCB_SlideCaughtMonToCenter; @@ -4790,10 +4790,10 @@ static void Task_LoadSearchMenu(u8 taskId) ResetOtherVideoRegisters(0); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sSearchMenu_BgTemplate, ARRAY_COUNT(sSearchMenu_BgTemplate)); - SetBgTilemapBuffer(3, AllocZeroed(0x800)); - SetBgTilemapBuffer(2, AllocZeroed(0x800)); - SetBgTilemapBuffer(1, AllocZeroed(0x800)); - SetBgTilemapBuffer(0, AllocZeroed(0x800)); + SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); InitWindows(sSearchMenu_WindowTemplate); DeactivateAllTextPrinters(); PutWindowTilemap(0); @@ -4877,13 +4877,13 @@ static void Task_SwitchToSearchMenuTopBar(u8 taskId) static void Task_HandleSearchTopBarInput(u8 taskId) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_PC_OFF); gTasks[taskId].func = Task_ExitSearch; return; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (gTasks[taskId].tTopBarItem) { @@ -4904,17 +4904,17 @@ static void Task_HandleSearchTopBarInput(u8 taskId) } return; } - if ((gMain.newKeys & DPAD_LEFT) && gTasks[taskId].tTopBarItem > SEARCH_TOPBAR_SEARCH) + if ((JOY_NEW(DPAD_LEFT)) && gTasks[taskId].tTopBarItem > SEARCH_TOPBAR_SEARCH) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].tTopBarItem--; HighlightSelectedSearchTopBarItem(gTasks[taskId].tTopBarItem); CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && gTasks[taskId].tTopBarItem < SEARCH_TOPBAR_CANCEL) + if ((JOY_NEW(DPAD_RIGHT)) && gTasks[taskId].tTopBarItem < SEARCH_TOPBAR_CANCEL) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].tTopBarItem++; HighlightSelectedSearchTopBarItem(gTasks[taskId].tTopBarItem); CopyWindowToVram(0, 2); @@ -4951,14 +4951,14 @@ static void Task_HandleSearchMenuInput(u8 taskId) movementMap = sSearchMovementMap_SearchNatDex; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); SetDefaultSearchModeAndOrder(taskId); gTasks[taskId].func = Task_SwitchToSearchMenuTopBar; return; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (gTasks[taskId].tMenuItem == SEARCH_OK) { @@ -4981,7 +4981,7 @@ static void Task_HandleSearchMenuInput(u8 taskId) { EraseAndPrintSearchTextBox(gText_SearchingPleaseWait); gTasks[taskId].func = Task_StartPokedexSearch; - PlaySE(SE_Z_SEARCH); + PlaySE(SE_DEX_SEARCH); CopyWindowToVram(0, 2); } } @@ -4993,7 +4993,7 @@ static void Task_HandleSearchMenuInput(u8 taskId) return; } - if ((gMain.newKeys & DPAD_LEFT) && movementMap[gTasks[taskId].tMenuItem][0] != 0xFF) + if ((JOY_NEW(DPAD_LEFT)) && movementMap[gTasks[taskId].tMenuItem][0] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][0]; @@ -5001,7 +5001,7 @@ static void Task_HandleSearchMenuInput(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && movementMap[gTasks[taskId].tMenuItem][1] != 0xFF) + if (JOY_NEW(DPAD_RIGHT) && movementMap[gTasks[taskId].tMenuItem][1] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][1]; @@ -5009,7 +5009,7 @@ static void Task_HandleSearchMenuInput(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_UP) && movementMap[gTasks[taskId].tMenuItem][2] != 0xFF) + if ((JOY_NEW(DPAD_UP)) && movementMap[gTasks[taskId].tMenuItem][2] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][2]; @@ -5017,7 +5017,7 @@ static void Task_HandleSearchMenuInput(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_DOWN) && movementMap[gTasks[taskId].tMenuItem][3] != 0xFF) + if ((JOY_NEW(DPAD_DOWN)) && movementMap[gTasks[taskId].tMenuItem][3] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][3]; @@ -5046,12 +5046,12 @@ static void Task_WaitAndCompleteSearch(u8 taskId) { if (sPokedexView->pokemonListCount != 0) { - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); EraseAndPrintSearchTextBox(gText_SearchCompleted); } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); EraseAndPrintSearchTextBox(gText_NoMatchingPkmnWereFound); } gTasks[taskId].func = Task_SearchCompleteWaitForInput; @@ -5061,7 +5061,7 @@ static void Task_WaitAndCompleteSearch(u8 taskId) static void Task_SearchCompleteWaitForInput(u8 taskId) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (sPokedexView->pokemonListCount != 0) { @@ -5075,7 +5075,7 @@ static void Task_SearchCompleteWaitForInput(u8 taskId) else { gTasks[taskId].func = Task_SwitchToSearchMenu; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -5114,7 +5114,7 @@ static void Task_HandleSearchParameterInput(u8 taskId) cursorPos = &gTasks[taskId].data[sSearchOptions[menuItem].taskDataCursorPos]; scrollOffset = &gTasks[taskId].data[sSearchOptions[menuItem].taskDataScrollOffset]; maxOption = sSearchOptions[menuItem].numOptions - 1; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_PIN); ClearSearchParameterBoxText(); @@ -5124,9 +5124,9 @@ static void Task_HandleSearchParameterInput(u8 taskId) CopyBgTilemapBufferToVram(3); return; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); ClearSearchParameterBoxText(); DrawOrEraseSearchParameterBox(TRUE); *cursorPos = gTasks[taskId].tCursorPos; @@ -5137,7 +5137,7 @@ static void Task_HandleSearchParameterInput(u8 taskId) return; } moved = FALSE; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { if (*cursorPos != 0) { @@ -5163,7 +5163,7 @@ static void Task_HandleSearchParameterInput(u8 taskId) } return; } - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) { if (*cursorPos < MAX_SEARCH_PARAM_CURSOR_POS && *cursorPos < maxOption) { @@ -5206,84 +5206,24 @@ static void Task_ExitSearchWaitForFade(u8 taskId) } } -#ifdef NONMATCHING -// This doesn't match because gcc flips the naming of the r7 and r6 -// registers. It also does one of the additions backwards. void SetSearchRectHighlight(u8 flags, u8 x, u8 y, u8 width) { - u16 i; - u16* ptr = GetBgTilemapBuffer(3); + u16 i, temp; //This would have been better as a pointer but here we are + u32 ptr = (u32)GetBgTilemapBuffer(3); //This should be a pointer, but this only matches as a u32. - u16* temp; for (i = 0; i < width; i++) { - // This addition is supposed to be done in this order; however, - // gcc will always do it in ptr + (y * 32) order. - temp = (y * 32) + ptr; - temp[x + i] %= 0x1000; - temp[x + i] |= flags * 0x1000; + temp = *(u16 *)(ptr + (y + 0) * 64 + (x + i) * 2); + temp &= 0x0fff; + temp |= (flags << 12); + *(u16 *)(ptr + (y + 0) * 64 + (x + i) * 2) = temp; - temp[x + i + 32] %= 0x1000; - temp[x + i + 32] |= flags * 0x1000; + temp = *(u16 *)(ptr + (y + 1) * 64 + (x + i) * 2); + temp &= 0x0fff; + temp |= (flags << 12); + *(u16 *)(ptr + (y + 1) * 64 + (x + i) * 2) = temp; } } -#else -__attribute__((naked)) -void SetSearchRectHighlight(u8 flags, u8 x, u8 y, u8 width) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - adds r4, r3, 0\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r8, r1\n\ - lsls r2, 24\n\ - lsrs r5, r2, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - movs r0, 0x3\n\ - bl GetBgTilemapBuffer\n\ - adds r2, r0, 0\n\ - movs r3, 0\n\ - cmp r3, r4\n\ - bcs _080C1DEC\n\ - lsls r0, r5, 6\n\ - adds r7, r0, r2\n\ - ldr r5, =0x00000fff\n\ - lsls r2, r6, 12\n\ -_080C1DC8:\n\ - mov r0, r8\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r3, r4\n\ - bcc _080C1DC8\n\ -_080C1DEC:\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided\n"); -} -#endif #define SEARCH_BG_SEARCH SEARCH_TOPBAR_SEARCH #define SEARCH_BG_SHIFT SEARCH_TOPBAR_SHIFT diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 0232d4fc48..fdbd2f40c5 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -724,15 +724,15 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId) return; break; case 1: - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { gTasks[taskId].data[1] = 1; PlaySE(SE_PC_OFF); } - else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + else if (JOY_NEW(DPAD_RIGHT) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { gTasks[taskId].data[1] = 2; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } else return; diff --git a/src/pokemon.c b/src/pokemon.c index eccc6edb26..433cfe9f08 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2186,22 +2186,22 @@ static const u16 sDeoxysBaseStats[] = const u16 gLinkPlayerFacilityClasses[NUM_MALE_LINK_FACILITY_CLASSES + NUM_FEMALE_LINK_FACILITY_CLASSES] = { // Male classes - FACILITY_CLASS_COOLTRAINER_M, - FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_BLACK_BELT, FACILITY_CLASS_CAMPER, - FACILITY_CLASS_YOUNGSTER, - FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_PSYCHIC_M, FACILITY_CLASS_BUG_CATCHER, - FACILITY_CLASS_PKMN_BREEDER_M, + FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, // Female Classes - FACILITY_CLASS_COOLTRAINER_F, - FACILITY_CLASS_HEX_MANIAC, + FACILITY_CLASS_COOLTRAINER_F, + FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, - FACILITY_CLASS_LASS, - FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_LASS, + FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, - FACILITY_CLASS_PKMN_BREEDER_F, + FACILITY_CLASS_PKMN_BREEDER_F, FACILITY_CLASS_BEAUTY }; @@ -6179,7 +6179,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event) if (friendship > 199) friendshipLevel++; - if ((event != FRIENDSHIP_EVENT_WALKING || !(Random() & 1)) + if ((event != FRIENDSHIP_EVENT_WALKING || !(Random() & 1)) && (event != FRIENDSHIP_EVENT_LEAGUE_BATTLE || IS_LEAGUE_BATTLE)) { s8 mod = sFriendshipEventModifiers[event][friendshipLevel]; @@ -6221,7 +6221,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies) { if (totalEVs >= MAX_TOTAL_EVS) break; - + if (CheckPartyHasHadPokerus(mon, 0)) multiplier = 2; else @@ -6268,9 +6268,9 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies) if (totalEVs + (s16)evIncrease > MAX_TOTAL_EVS) evIncrease = ((s16)evIncrease + MAX_TOTAL_EVS) - (totalEVs + evIncrease); - if (evs[i] + (s16)evIncrease > 255) + if (evs[i] + (s16)evIncrease > MAX_PER_STAT_EVS) { - int val1 = (s16)evIncrease + 255; + int val1 = (s16)evIncrease + MAX_PER_STAT_EVS; int val2 = evs[i] + evIncrease; evIncrease = val1 - val2; } @@ -6511,7 +6511,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves) for (i = 0; i < MAX_MON_MOVES; i++) learnedMoves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, 0); - for (i = 0; i < 20; i++) + for (i = 0; i < MAX_LEVEL_UP_MOVES; i++) { u16 moveLevel; @@ -6544,7 +6544,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 numMoves = 0; int i; - for (i = 0; i < 20 && gLevelUpLearnsets[species][i].move != LEVEL_UP_END; i++) + for (i = 0; i < MAX_LEVEL_UP_MOVES && gLevelUpLearnsets[species][i].move != LEVEL_UP_END; i++) moves[numMoves++] = gLevelUpLearnsets[species][i].move; return numMoves; @@ -6552,8 +6552,8 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) { - u16 learnedMoves[4]; - u16 moves[20]; + u16 learnedMoves[MAX_MON_MOVES]; + u16 moves[MAX_LEVEL_UP_MOVES]; u8 numMoves = 0; u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); u8 level = GetMonData(mon, MON_DATA_LEVEL, 0); @@ -6565,7 +6565,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) for (i = 0; i < MAX_MON_MOVES; i++) learnedMoves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, 0); - for (i = 0; i < 20; i++) + for (i = 0; i < MAX_LEVEL_UP_MOVES; i++) { u16 moveLevel; @@ -6626,11 +6626,11 @@ void ClearBattleMonForms(void) u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return MUS_BATTLE34; + return MUS_VS_KYOGRE_GROUDON; else if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return MUS_BATTLE36; + return MUS_VS_REGI; else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) - return MUS_BATTLE20; + return MUS_VS_TRAINER; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass; @@ -6646,24 +6646,24 @@ u16 GetBattleBGM(void) { case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_LEADER: - return MUS_BATTLE30; + return MUS_VS_AQUA_MAGMA_LEADER; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: case TRAINER_CLASS_AQUA_ADMIN: case TRAINER_CLASS_MAGMA_ADMIN: - return MUS_BATTLE31; + return MUS_VS_AQUA_MAGMA; case TRAINER_CLASS_LEADER: - return MUS_BATTLE32; + return MUS_VS_GYM_LEADER; case TRAINER_CLASS_CHAMPION: - return MUS_BATTLE33; + return MUS_VS_CHAMPION; case TRAINER_CLASS_PKMN_TRAINER_3: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) - return MUS_BATTLE35; + return MUS_VS_RIVAL; if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName)) - return MUS_BATTLE20; - return MUS_BATTLE35; + return MUS_VS_TRAINER; + return MUS_VS_RIVAL; case TRAINER_CLASS_ELITE_FOUR: - return MUS_BATTLE38; + return MUS_VS_ELITE_FOUR; case TRAINER_CLASS_SALON_MAIDEN: case TRAINER_CLASS_DOME_ACE: case TRAINER_CLASS_PALACE_MAVEN: @@ -6671,13 +6671,13 @@ u16 GetBattleBGM(void) case TRAINER_CLASS_FACTORY_HEAD: case TRAINER_CLASS_PIKE_QUEEN: case TRAINER_CLASS_PYRAMID_KING: - return MUS_VS_FRONT; + return MUS_VS_FRONTIER_BRAIN; default: - return MUS_BATTLE20; + return MUS_VS_TRAINER; } } else - return MUS_BATTLE27; + return MUS_VS_WILD; } void PlayBattleBGM(void) diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index d2f9175542..bfac9fd758 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -406,7 +406,7 @@ void StartPokemonJump(u16 partyIndex, MainCallback callback) if (gReceivedRemoteLinkPlayers) { - gUnknown_02022CFC = Alloc(sizeof(*gUnknown_02022CFC)); + gUnknown_02022CFC = Alloc(sizeof(struct PokemonJump1)); if (gUnknown_02022CFC) { ResetTasks(); @@ -576,7 +576,7 @@ static void sub_802ACA0(u8 taskId) case 2: if (!sub_802D0F0() && IsNotWaitingForBGMStop() == TRUE) { - FadeOutAndPlayNewMapMusic(MUS_RG_JUMP, 8); + FadeOutAndPlayNewMapMusic(MUS_RG_POKE_JUMP, 8); gUnknown_02022CFC->unk8++; } break; @@ -1245,7 +1245,7 @@ static bool32 sub_802B8CC(void) break; // fall through case 1: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { sub_802C164(); sub_802AE14(3); @@ -1336,7 +1336,7 @@ static bool32 sub_802BA58(void) case 2: case 5: gUnknown_02022CFC->unk3C++; - if (gMain.newKeys & (A_BUTTON | B_BUTTON) || gUnknown_02022CFC->unk3C > 180) + if (JOY_NEW(A_BUTTON | B_BUTTON) || gUnknown_02022CFC->unk3C > 180) { sub_802DA14(); gUnknown_02022CFC->unkA++; @@ -1721,7 +1721,7 @@ static void sub_802C1BC(void) gUnknown_02022CFC->unk83AC->unk10 = 0; } -static const u16 gUnknown_082FB654[] = {SE_REGI, SE_REAPOKE, SE_W234, SE_RG_EXCELLENT}; +static const u16 gUnknown_082FB654[] = {SE_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_RG_POKE_JUMP_SUCCESS}; static void sub_802C1DC(void) { @@ -1798,9 +1798,9 @@ static void sub_802C280(void) } if (whichSound & 0x2) - PlaySE(SE_RG_NAWAMISS); + PlaySE(SE_RG_POKE_JUMP_FAILURE); else if (whichSound & 0x1) - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); } static const s8 gUnknown_082FB65C[][48] = @@ -2702,7 +2702,7 @@ static void sub_802CDD4(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); sprite->data[1] = 0; sprite->data[0]++; // fall through @@ -3275,7 +3275,7 @@ static void sub_802D7E8(u16 itemId, u16 quantity) gUnknown_02022D00->unk12 = sub_802DA9C(4, 8, 22, 4); AddTextPrinterParameterized(gUnknown_02022D00->unk12, 1, gUnknown_02022D00->strBuff, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_02022D00->unk12, 2); - gUnknown_02022D00->unk14 = MUS_FANFA1; + gUnknown_02022D00->unk14 = MUS_LEVEL_UP; gUnknown_02022D00->unkD = 0; } @@ -3684,14 +3684,14 @@ static void sub_802E0AC(struct PokemonJump1_MonInfo *arg0) packet.species = arg0->species, packet.otId = arg0->otId, packet.personality = arg0->personality, - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static bool32 sub_802E0D0(int multiplayerId, struct PokemonJump1_MonInfo *arg0) { struct MonInfoPacket packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); @@ -3718,7 +3718,7 @@ static void sub_802E120(u32 arg0) struct UnkPacket2 packet; packet.id = 2; packet.unk4 = arg0; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } struct UnkPacket3 @@ -3746,14 +3746,14 @@ static void sub_802E138(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub * packet.unk2 = arg0->unk10; packet.unk3_1 = arg0->unk14; packet.unk4 = arg0->unkE; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static bool32 sub_802E1BC(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) { struct UnkPacket3 packet; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[0][1], sizeof(packet)); @@ -3792,14 +3792,14 @@ static void sub_802E234(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2) packet.unk4 = arg0->unkE; packet.unk6 = arg1; packet.unk8 = arg2; - sub_800FE50(&packet); + Rfu_SendPacket(&packet); } static bool32 sub_802E264(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3) { struct UnkPacket4 packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); @@ -3819,7 +3819,7 @@ static bool32 sub_802E2D0(struct PokemonJump1_82E4 *arg0, int multiplayerId) { struct UnkPacket4 packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); @@ -3922,7 +3922,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId) data[0]++; break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { rbox_fill_rectangle(data[1]); CopyWindowToVram(data[1], 1); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 5f2f5516b6..ae334504e0 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1756,10 +1756,10 @@ static void Task_PokemonStorageSystemPC(u8 taskId) { case MENU_NOTHING_CHOSEN: task->data[3] = task->data[1]; - if (gMain.newKeys & DPAD_UP && --task->data[3] < 0) + if (JOY_NEW(DPAD_UP) && --task->data[3] < 0) task->data[3] = 4; - if (gMain.newKeys & DPAD_DOWN && ++task->data[3] > 4) + if (JOY_NEW(DPAD_DOWN) && ++task->data[3] > 4) task->data[3] = 0; if (task->data[1] != task->data[3]) { @@ -1798,13 +1798,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) } break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } - else if (gMain.newKeys & DPAD_UP) + else if (JOY_NEW(DPAD_UP)) { if (--task->data[1] < 0) task->data[1] = 4; @@ -1814,7 +1814,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { if (++task->data[1] > 3) task->data[1] = 0; @@ -1976,22 +1976,22 @@ static void sub_80C78E4(void) static u8 HandleBoxChooseSelectionInput(void) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); return 201; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); return gUnknown_02039D04->curBox; } - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { PlaySE(SE_SELECT); sub_80C7BB4(); } - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) { PlaySE(SE_SELECT); sub_80C7B80(); @@ -2157,7 +2157,7 @@ static void Cb2_EnterPSS(u8 boxOption) { ResetTasks(); sCurrentBoxOption = boxOption; - sPSSData = Alloc(sizeof(*sPSSData)); + sPSSData = Alloc(sizeof(struct PokemonStorageSystemData)); if (sPSSData == NULL) { SetMainCallback2(Cb2_ExitPSS); @@ -2177,7 +2177,7 @@ static void Cb2_EnterPSS(u8 boxOption) static void Cb2_ReturnToPSS(void) { ResetTasks(); - sPSSData = Alloc(sizeof(*sPSSData)); + sPSSData = Alloc(sizeof(struct PokemonStorageSystemData)); if (sPSSData == NULL) { SetMainCallback2(Cb2_ExitPSS); @@ -2393,7 +2393,7 @@ static void Cb_ReshowPSS(u8 taskId) } break; case 2: - if (!IsDma3ManagerBusyWithBgCopy() && gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (!IsDma3ManagerBusyWithBgCopy() && JOY_NEW(A_BUTTON | B_BUTTON)) { ClearBottomWindow(); sPSSData->state++; @@ -2576,7 +2576,7 @@ static void Cb_MainPSS(u8 taskId) sPSSData->state = 7; break; case 24: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; } break; @@ -2615,24 +2615,24 @@ static void Cb_MainPSS(u8 taskId) } break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sPSSData->state = 0; } break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); sPSSData->state = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); sPSSData->state = 6; break; case 6: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -2843,22 +2843,22 @@ static void Cb_OnSelectedMon(u8 taskId) } break; case 3: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); sPSSData->state = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); sPSSData->state = 6; break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); sPSSData->state = 6; break; case 6: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -2943,7 +2943,7 @@ static void Cb_WithdrawMon(u8 taskId) } break; case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -3034,7 +3034,7 @@ static void Cb_DepositMenu(u8 taskId) } break; case 4: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); sPSSData->state = 1; @@ -3095,14 +3095,14 @@ static void Cb_ReleaseMon(u8 taskId) sPSSData->state++; break; case 4: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { PrintStorageActionText(PC_TEXT_BYE_BYE); sPSSData->state++; } break; case 5: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); if (sInPartyMenu) @@ -3134,14 +3134,14 @@ static void Cb_ReleaseMon(u8 taskId) sPSSData->state++; break; case 9: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { PrintStorageActionText(PC_TEXT_SURPRISE); sPSSData->state++; } break; case 10: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sub_80CC064(); @@ -3157,14 +3157,14 @@ static void Cb_ReleaseMon(u8 taskId) } break; case 12: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { PrintStorageActionText(PC_TEXT_WORRIED); sPSSData->state++; } break; case 13: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -3257,7 +3257,7 @@ static void Cb_GiveMovingItemToMon(u8 taskId) } break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sPSSData->state++; @@ -3277,7 +3277,7 @@ static void Cb_ItemToBag(u8 taskId) case 0: if (!AddBagItem(sPSSData->cursorMonItem, 1)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_BAG_FULL); sPSSData->state = 3; } @@ -3296,7 +3296,7 @@ static void Cb_ItemToBag(u8 taskId) } break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sub_80CE00C(); @@ -3309,7 +3309,7 @@ static void Cb_ItemToBag(u8 taskId) SetPSSCallback(Cb_MainPSS); break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -3349,7 +3349,7 @@ static void Cb_SwitchSelectedItem(u8 taskId) } break; case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sPSSData->state++; @@ -3388,7 +3388,7 @@ static void Cb_ShowItemInfo(u8 taskId) sPSSData->state++; break; case 4: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { PlaySE(SE_WIN_OPEN); sPSSData->state++; @@ -3438,7 +3438,7 @@ static void Cb_CloseBoxWhileHoldingItem(u8 taskId) } break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sPSSData->state = 5; @@ -3494,7 +3494,7 @@ static void Cb_PrintCantStoreMail(u8 taskId) sPSSData->state++; break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); sPSSData->state++; @@ -3742,7 +3742,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId) case 0: if (IsMonBeingMoved()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); sPSSData->state = 1; } @@ -3759,7 +3759,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId) } break; case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -3803,7 +3803,7 @@ static void Cb_OnBPressed(u8 taskId) case 0: if (IsMonBeingMoved()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); sPSSData->state = 1; } @@ -3820,7 +3820,7 @@ static void Cb_OnBPressed(u8 taskId) } break; case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY)) { ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); @@ -5462,7 +5462,7 @@ static void sub_80CCA3C(const void *tilemap, s8 direction, u8 arg2) if (direction == 0) return; - else if (direction > 0) + if (direction > 0) x *= 1, x += 0x14; // x * 1 is needed to match, but can be safely removed as it makes no functional difference else x -= 4; @@ -6940,7 +6940,7 @@ static u8 InBoxInput_Normal(void) sPSSData->field_CD3 = 0; sPSSData->field_CD7 = 0; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { retVal = TRUE; if (sBoxCursorPosition >= IN_BOX_ROWS) @@ -6954,7 +6954,7 @@ static u8 InBoxInput_Normal(void) } break; } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { retVal = TRUE; cursorPosition += IN_BOX_ROWS; @@ -6968,7 +6968,7 @@ static u8 InBoxInput_Normal(void) } break; } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { retVal = TRUE; if (sBoxCursorPosition % IN_BOX_ROWS != 0) @@ -6982,7 +6982,7 @@ static u8 InBoxInput_Normal(void) } break; } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { retVal = TRUE; if ((sBoxCursorPosition + 1) % IN_BOX_ROWS != 0) @@ -6996,7 +6996,7 @@ static u8 InBoxInput_Normal(void) } break; } - else if (gMain.newKeys & START_BUTTON) + else if (JOY_NEW(START_BUTTON)) { retVal = TRUE; cursorArea = CURSOR_AREA_BOX; @@ -7004,7 +7004,7 @@ static u8 InBoxInput_Normal(void) break; } - if ((gMain.newKeys & A_BUTTON) && sub_80CFA5C()) + if ((JOY_NEW(A_BUTTON)) && sub_80CFA5C()) { if (!sCanOnlyMove) return 8; @@ -7038,18 +7038,18 @@ static u8 InBoxInput_Normal(void) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return 19; if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.heldKeys & L_BUTTON) + if (JOY_HELD(L_BUTTON)) return 10; - if (gMain.heldKeys & R_BUTTON) + if (JOY_HELD(R_BUTTON)) return 9; } - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { sub_80CFDC4(); return 0; @@ -7067,9 +7067,9 @@ static u8 InBoxInput_Normal(void) static u8 InBoxInput_GrabbingMultiple(void) { - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { if (sBoxCursorPosition / IN_BOX_ROWS != 0) { @@ -7081,7 +7081,7 @@ static u8 InBoxInput_GrabbingMultiple(void) return 24; } } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { if (sBoxCursorPosition + IN_BOX_ROWS < IN_BOX_COUNT) { @@ -7093,7 +7093,7 @@ static u8 InBoxInput_GrabbingMultiple(void) return 24; } } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { if (sBoxCursorPosition % IN_BOX_ROWS != 0) { @@ -7105,7 +7105,7 @@ static u8 InBoxInput_GrabbingMultiple(void) return 24; } } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { if ((sBoxCursorPosition + 1) % IN_BOX_ROWS != 0) { @@ -7142,7 +7142,7 @@ static u8 InBoxInput_GrabbingMultiple(void) static u8 InBoxInput_MovingMultiple(void) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { if (sub_80D0580(0)) { @@ -7154,7 +7154,7 @@ static u8 InBoxInput_MovingMultiple(void) return 24; } } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { if (sub_80D0580(1)) { @@ -7166,7 +7166,7 @@ static u8 InBoxInput_MovingMultiple(void) return 24; } } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { if (sub_80D0580(2)) { @@ -7178,7 +7178,7 @@ static u8 InBoxInput_MovingMultiple(void) return 10; } } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { if (sub_80D0580(3)) { @@ -7190,7 +7190,7 @@ static u8 InBoxInput_MovingMultiple(void) return 9; } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (sub_80D0BC0()) { @@ -7203,7 +7203,7 @@ static u8 InBoxInput_MovingMultiple(void) return 24; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return 24; } @@ -7211,9 +7211,9 @@ static u8 InBoxInput_MovingMultiple(void) { if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.heldKeys & L_BUTTON) + if (JOY_HELD(L_BUTTON)) return 10; - if (gMain.heldKeys & R_BUTTON) + if (JOY_HELD(R_BUTTON)) return 9; } @@ -7238,7 +7238,7 @@ static u8 HandleInput_InParty(void) gotoBox = FALSE; retVal = 0; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { if (--cursorPosition < 0) cursorPosition = PARTY_SIZE; @@ -7246,7 +7246,7 @@ static u8 HandleInput_InParty(void) retVal = 1; break; } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { if (++cursorPosition > PARTY_SIZE) cursorPosition = 0; @@ -7254,14 +7254,14 @@ static u8 HandleInput_InParty(void) retVal = 1; break; } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT && sBoxCursorPosition != 0) + else if (JOY_REPEAT(DPAD_LEFT) && sBoxCursorPosition != 0) { retVal = 1; sPSSData->field_CD6 = sBoxCursorPosition; cursorPosition = 0; break; } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { if (sBoxCursorPosition == 0) { @@ -7277,7 +7277,7 @@ static u8 HandleInput_InParty(void) break; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (sBoxCursorPosition == PARTY_SIZE) { @@ -7313,7 +7313,7 @@ static u8 HandleInput_InParty(void) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (sPSSData->boxOption == BOX_OPTION_DEPOSIT) return 19; @@ -7327,7 +7327,7 @@ static u8 HandleInput_InParty(void) cursorArea = CURSOR_AREA_IN_BOX; cursorPosition = 0; } - else if (gMain.newKeys & SELECT_BUTTON) + else if (JOY_NEW(SELECT_BUTTON)) { sub_80CFDC4(); return 0; @@ -7356,7 +7356,7 @@ static u8 HandleInput_OnBox(void) sPSSData->field_CD2 = 0; sPSSData->field_CD7 = 0; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { retVal = 1; cursorArea = CURSOR_AREA_BUTTONS; @@ -7364,7 +7364,7 @@ static u8 HandleInput_OnBox(void) sPSSData->field_CD7 = 1; break; } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { retVal = 1; cursorArea = CURSOR_AREA_IN_BOX; @@ -7372,30 +7372,30 @@ static u8 HandleInput_OnBox(void) break; } - if (gMain.heldKeys & DPAD_LEFT) + if (JOY_HELD(DPAD_LEFT)) return 10; - if (gMain.heldKeys & DPAD_RIGHT) + if (JOY_HELD(DPAD_RIGHT)) return 9; if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.heldKeys & L_BUTTON) + if (JOY_HELD(L_BUTTON)) return 10; - if (gMain.heldKeys & R_BUTTON) + if (JOY_HELD(R_BUTTON)) return 9; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { sub_80CD1A8(FALSE); AddBoxMenu(); return 7; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return 19; - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { sub_80CFDC4(); return 0; @@ -7429,7 +7429,7 @@ static u8 HandleInput_OnButtons(void) sPSSData->field_CD2 = 0; sPSSData->field_CD7 = 0; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { retVal = 1; cursorArea = CURSOR_AREA_IN_BOX; @@ -7441,7 +7441,8 @@ static u8 HandleInput_OnButtons(void) sPSSData->field_CD7 = 1; break; } - else if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) + + if (JOY_REPEAT(DPAD_DOWN | START_BUTTON)) { retVal = 1; cursorArea = CURSOR_AREA_BOX; @@ -7450,14 +7451,14 @@ static u8 HandleInput_OnButtons(void) break; } - if (gMain.newAndRepeatedKeys & DPAD_LEFT) + if (JOY_REPEAT(DPAD_LEFT)) { retVal = 1; if (--cursorPosition < 0) cursorPosition = 1; break; } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { retVal = 1; if (++cursorPosition > 1) @@ -7465,12 +7466,12 @@ static u8 HandleInput_OnButtons(void) break; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) return (cursorPosition == 0) ? 5 : 4; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return 19; - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { sub_80CFDC4(); return 0; @@ -7919,23 +7920,23 @@ static s16 sub_80D00AC(void) do { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { textId = Menu_GetCursorPos(); break; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); textId = -1; } - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { PlaySE(SE_SELECT); Menu_MoveCursor(-1); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { PlaySE(SE_SELECT); Menu_MoveCursor(1); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 6acb6086d4..6232ff802e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1503,23 +1503,23 @@ static void Task_HandleInput(u8 taskId) { if (MenuHelpers_CallLinkSomething() != TRUE && !gPaletteFade.active) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { ChangeSummaryPokemon(taskId, -1); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { ChangeSummaryPokemon(taskId, 1); } - else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { ChangePage(taskId, -1); } - else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { ChangePage(taskId, 1); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (sMonSummaryScreen->currPageIndex != PSS_PAGE_SKILLS) { @@ -1536,7 +1536,7 @@ static void Task_HandleInput(u8 taskId) } } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { StopPokemonAnimations(); PlaySE(SE_SELECT); @@ -1884,17 +1884,17 @@ static void Task_HandleInput_MoveSelect(u8 taskId) if (MenuHelpers_CallLinkSomething() != 1) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { data[0] = 4; ChangeSelectedMove(data, -1, &sMonSummaryScreen->firstMoveIndex); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { data[0] = 4; ChangeSelectedMove(data, 1, &sMonSummaryScreen->firstMoveIndex); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (sMonSummaryScreen->lockMovesFlag == TRUE || (sMonSummaryScreen->newMove == MOVE_NONE && sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES)) @@ -1909,10 +1909,10 @@ static void Task_HandleInput_MoveSelect(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); CloseMoveSelectMode(taskId); @@ -2024,24 +2024,24 @@ static void Task_HandleInput_MovePositionSwitch(u8 taskId) if (MenuHelpers_CallLinkSomething() != TRUE) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { data[0] = 3; ChangeSelectedMove(&data[0], -1, &sMonSummaryScreen->secondMoveIndex); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { data[0] = 3; ChangeSelectedMove(&data[0], 1, &sMonSummaryScreen->secondMoveIndex); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (sMonSummaryScreen->firstMoveIndex == sMonSummaryScreen->secondMoveIndex) ExitMovePositionSwitchMode(taskId, FALSE); else ExitMovePositionSwitchMode(taskId, TRUE); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { ExitMovePositionSwitchMode(taskId, FALSE); } @@ -2167,25 +2167,25 @@ static void Task_HandleReplaceMoveInput(u8 taskId) { if (gPaletteFade.active != TRUE) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { data[0] = 4; ChangeSelectedMove(data, -1, &sMonSummaryScreen->firstMoveIndex); } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { data[0] = 4; ChangeSelectedMove(data, 1, &sMonSummaryScreen->firstMoveIndex); } - else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { ChangePage(taskId, -1); } - else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { ChangePage(taskId, 1); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (CanReplaceMove() == TRUE) { @@ -2197,11 +2197,11 @@ static void Task_HandleReplaceMoveInput(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); ShowCantForgetHMsWindow(taskId); } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { StopPokemonAnimations(); PlaySE(SE_SELECT); @@ -2241,7 +2241,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) u16 move; if (FuncIsActiveTask(Task_ShowPowerAccWindow) != 1) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { data[1] = 1; data[0] = 4; @@ -2249,7 +2249,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) data[1] = 0; gTasks[taskId].func = Task_HandleReplaceMoveInput; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { data[1] = 1; data[0] = 4; @@ -2257,7 +2257,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) data[1] = 0; gTasks[taskId].func = Task_HandleReplaceMoveInput; } - else if (gMain.newKeys & DPAD_LEFT || GetLRKeysPressed() == MENU_L_PRESSED) + else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED) { if (sMonSummaryScreen->currPageIndex != PSS_PAGE_BATTLE_MOVES) { @@ -2271,7 +2271,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) HandleAppealJamTilemap(9, -2, move); } } - else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysPressed() == MENU_R_PRESSED) + else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED) { if (sMonSummaryScreen->currPageIndex != PSS_PAGE_CONTEST_MOVES) { @@ -2285,7 +2285,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) HandleAppealJamTilemap(9, -2, move); } } - else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + else if (JOY_NEW(A_BUTTON | B_BUTTON)) { ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); if (!gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_STATUS]].invisible) diff --git a/src/pokenav.c b/src/pokenav.c index 8ea33575a0..30dc001c37 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -317,7 +317,7 @@ static void Task_RunLoopedTask_LinkMode(u8 taskId) void CB2_InitPokeNav(void) { - gPokenavResources = Alloc(sizeof(*gPokenavResources)); + gPokenavResources = Alloc(sizeof(struct PokenavResources)); if (gPokenavResources == NULL) { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); @@ -345,7 +345,7 @@ static void CB2_InitPokenavForTutorial(void) if (gPaletteFade.active) return; - gPokenavResources = Alloc(sizeof(*gPokenavResources)); + gPokenavResources = Alloc(sizeof(struct PokenavResources)); if (gPokenavResources == NULL) { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); diff --git a/src/pokenav_conditions_1.c b/src/pokenav_conditions_1.c index 1c7573a442..488d40d130 100644 --- a/src/pokenav_conditions_1.c +++ b/src/pokenav_conditions_1.c @@ -89,13 +89,13 @@ u32 sub_81CD08C(struct PokenavSub11 *structPtr) if (ret == 0) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); structPtr->unk6304 = sub_81CD19C; ret = 2; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (structPtr->unk6300 == 0) { @@ -166,7 +166,7 @@ u8 sub_81CD1E4(struct PokenavSub11 *structPtr) struct PokenavSub18 *unkPtr = GetSubstructPtr(18); u8 ret = 0; - if (gMain.heldKeys & DPAD_UP) + if (JOY_HELD(DPAD_UP)) { if (structPtr->unk6300 == 0 || unkPtr->unk2 != 0) { @@ -174,7 +174,7 @@ u8 sub_81CD1E4(struct PokenavSub11 *structPtr) ret = sub_81CD258(1); } } - else if (gMain.heldKeys & DPAD_DOWN) + else if (JOY_HELD(DPAD_DOWN)) { if (structPtr->unk6300 == 0 || unkPtr->unk2 < unkPtr->unk0 - 1) { diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_3.c index eea4aa397c..15b687a429 100644 --- a/src/pokenav_conditions_3.c +++ b/src/pokenav_conditions_3.c @@ -170,29 +170,28 @@ static bool32 sub_81CF010(struct PokenavSub7 *structPtr) static u32 sub_81CF030(struct PokenavSub7 *structPtr) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return 1; - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return 2; - else if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) return 3; - else if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) return 4; - else if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { structPtr->unk1C = 0; structPtr->unk0 = sub_81CF0B0; return 5; } - else if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { structPtr->unkPtr->unk2 = GetSelectedMatchCall(); structPtr->unk1C = 1; structPtr->unk0 = sub_81CF0B8; return 6; } - else - return 0; + return 0; } static u32 sub_81CF0B0(struct PokenavSub7 *structPtr) diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index d9aae7e4ed..f2b9b0dcca 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -293,7 +293,7 @@ static const struct SpriteTemplate sUnknown_0861FB44 = bool32 InitPokenavMainMenu(void) { struct PokenavMainMenuResources *structPtr; - + structPtr = AllocSubstruct(0, sizeof(struct PokenavMainMenuResources)); if (structPtr == NULL) return FALSE; @@ -312,7 +312,7 @@ u32 PokenavMainMenuLoopedTaskIsActive(void) void ShutdownPokenav(void) { - PlaySE(SE_PN_OFF); + PlaySE(SE_POKENAV_OFF); sub_81CAADC(); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); } @@ -436,9 +436,10 @@ static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0) if (ChangeBgY(0, 384, 2) <= 0) { ChangeBgY(0, 0, 0); - return 4; + return LT_FINISH; } - return 2; + + return LT_PAUSE; } void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) @@ -458,11 +459,9 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes) { break; } - else - { - index = (index * 16) + 0x100; - CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); - } + + index = (index * 16) + 0x100; + CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); } } @@ -471,140 +470,41 @@ void sub_81C7990(u32 a0, u16 a1) CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); } -NAKED -void sub_81C79BC(const u16 *a0, const u16 *a1, u32 a2, u32 a3, u32 a4, u16 *a5) +void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0xC\n\ - str r0, [sp]\n\ - str r1, [sp, 0x4]\n\ - mov r10, r2\n\ - str r3, [sp, 0x8]\n\ - ldr r0, [sp, 0x2C]\n\ - cmp r0, 0\n\ - bne _081C79E4\n\ - ldr r2, =0x001fffff\n\ - mov r1, r10\n\ - ands r2, r1\n\ - ldr r0, [sp]\n\ - b _081C79F4\n\ - .pool\n\ -_081C79E4:\n\ - ldr r2, [sp, 0x2C]\n\ - ldr r0, [sp, 0x8]\n\ - cmp r2, r0\n\ - blt _081C7A00\n\ - ldr r2, =0x001fffff\n\ - mov r1, r10\n\ - ands r2, r1\n\ - ldr r0, [sp, 0x4]\n\ -_081C79F4:\n\ - ldr r1, [sp, 0x30]\n\ - bl CpuSet\n\ - b _081C7AAE\n\ - .pool\n\ -_081C7A00:\n\ - movs r2, 0x1\n\ - negs r2, r2\n\ - add r10, r2\n\ - b _081C7AA6\n\ -_081C7A08:\n\ - ldr r1, [sp]\n\ - ldrh r0, [r1]\n\ - movs r2, 0x1F\n\ - mov r9, r2\n\ - mov r1, r9\n\ - ands r1, r0\n\ - mov r9, r1\n\ - lsls r0, 16\n\ - lsrs r2, r0, 21\n\ - movs r1, 0x1F\n\ - ands r1, r2\n\ - mov r8, r1\n\ - lsrs r7, r0, 26\n\ - movs r2, 0x1F\n\ - ands r7, r2\n\ - ldr r0, [sp, 0x4]\n\ - ldrh r4, [r0]\n\ - movs r0, 0x1F\n\ - ands r0, r4\n\ - mov r1, r9\n\ - subs r0, r1\n\ - lsls r0, 8\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r2, [sp, 0x2C]\n\ - adds r6, r0, 0\n\ - muls r6, r2\n\ - asrs r6, 8\n\ - lsls r4, 16\n\ - lsrs r0, r4, 21\n\ - movs r1, 0x1F\n\ - ands r0, r1\n\ - mov r2, r8\n\ - subs r0, r2\n\ - lsls r0, 8\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r1, [sp, 0x2C]\n\ - adds r5, r0, 0\n\ - muls r5, r1\n\ - asrs r5, 8\n\ - lsrs r4, 26\n\ - movs r2, 0x1F\n\ - ands r4, r2\n\ - subs r4, r7\n\ - lsls r4, 8\n\ - adds r0, r4, 0\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r1, [sp, 0x2C]\n\ - muls r0, r1\n\ - asrs r0, 8\n\ - add r6, r9\n\ - movs r2, 0x1F\n\ - ands r6, r2\n\ - add r5, r8\n\ - ands r5, r2\n\ - adds r0, r7, r0\n\ - ands r0, r2\n\ - lsls r0, 10\n\ - lsls r5, 5\n\ - orrs r0, r5\n\ - orrs r0, r6\n\ - ldr r1, [sp, 0x30]\n\ - strh r0, [r1]\n\ - ldr r2, [sp]\n\ - adds r2, 0x2\n\ - str r2, [sp]\n\ - ldr r0, [sp, 0x4]\n\ - adds r0, 0x2\n\ - str r0, [sp, 0x4]\n\ - adds r1, 0x2\n\ - str r1, [sp, 0x30]\n\ - movs r1, 0x1\n\ - negs r1, r1\n\ - add r10, r1\n\ -_081C7AA6:\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - cmp r10, r0\n\ - bne _081C7A08\n\ -_081C7AAE:\n\ - add sp, 0xC\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided"); + + if (a4 == 0) + { + CpuCopy16(a0, palette, a2 * 2); + } + else if (a4 >= a3) + { + CpuCopy16(a1, palette, a2 * 2); + } + else + { + int r, g, b; + int r1, g1, b1; + while (a2--) + { + r = GET_R(*a0); + g = GET_G(*a0); + b = GET_B(*a0); + + r1 = ((((GET_R(*a1) << 8) - (r << 8)) / a3) * a4) >> 8; + g1 = ((((GET_G(*a1) << 8) - (g << 8)) / a3) * a4) >> 8; + b1 = ((((GET_B(*a1) << 8) - (b << 8)) / a3) * a4) >> 8; + + r = (r + r1) & 0x1F; //_RGB(r + r1, g + g1, b + b1); doesn't match; I have to assign the value of ((r + r1) & 0x1F) to r1 + g = (g + g1) & 0x1F; //See above + b = (b + b1) & 0x1F; //See above + + *palette = RGB2(r, g, b); //See above comment + + a0++, a1++; + palette++; + } + } } void PokenavFadeScreen(s32 fadeType) @@ -781,7 +681,7 @@ static void LoadLeftHeaderGfxForMenu(u32 menuGfxId) size = GetDecompressedDataSize(sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].data); LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20); LZ77UnCompWram(sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].data, gDecompressionBuffer); - RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1); + RequestDma3Copy(gDecompressionBuffer, (void *)OBJ_VRAM0 + (GetSpriteTileStartByTag(2) * 32), size, 1); structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].size; if (menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_OUT || menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_IN) diff --git a/src/pokenav_match_call_1.c b/src/pokenav_match_call_1.c index 1e4239bbc3..d919a4dbf8 100755 --- a/src/pokenav_match_call_1.c +++ b/src/pokenav_match_call_1.c @@ -79,16 +79,16 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state) { int selection; - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return POKENAV_MC_FUNC_UP; - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return POKENAV_MC_FUNC_DOWN; - if (gMain.newAndRepeatedKeys & DPAD_LEFT) + if (JOY_REPEAT(DPAD_LEFT)) return POKENAV_MC_FUNC_PG_UP; - if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + if (JOY_REPEAT(DPAD_RIGHT)) return POKENAV_MC_FUNC_PG_DOWN; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { state->callback = CB2_HandleMatchCallOptionsInput; state->optionCursorPos = 0; @@ -108,7 +108,7 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state) return POKENAV_MC_FUNC_SELECT; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (GetPokenavMode() != POKENAV_MODE_FORCE_CALL_READY) { @@ -118,7 +118,7 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state) else { // Cant exit Match Call menu before calling Mr Stone during tutorial - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } } @@ -132,19 +132,19 @@ static u32 GetExitMatchCallMenuId(struct Pokenav3Struct *state) static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state) { - if ((gMain.newKeys & DPAD_UP) && state->optionCursorPos) + if ((JOY_NEW(DPAD_UP)) && state->optionCursorPos) { state->optionCursorPos--; return POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR; } - if ((gMain.newKeys & DPAD_DOWN) && state->optionCursorPos < state->maxOptionId) + if ((JOY_NEW(DPAD_DOWN)) && state->optionCursorPos < state->maxOptionId) { state->optionCursorPos++; return POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (state->matchCallOptions[state->optionCursorPos]) { @@ -166,7 +166,7 @@ static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { state->callback = CB2_HandleMatchCallInput; return POKENAV_MC_FUNC_CANCEL; @@ -177,12 +177,12 @@ static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state) static u32 CB2_HandleCheckPageInput(struct Pokenav3Struct *state) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return POKENAV_MC_FUNC_CHECK_PAGE_UP; - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return POKENAV_MC_FUNC_CHECK_PAGE_DOWN; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { state->callback = CB2_HandleMatchCallInput; return POKENAV_MC_FUNC_EXIT_CHECK_PAGE; @@ -193,7 +193,7 @@ static u32 CB2_HandleCheckPageInput(struct Pokenav3Struct *state) static u32 CB2_HandleCallInput(struct Pokenav3Struct *state) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { state->callback = CB2_HandleMatchCallInput; return POKENAV_MC_FUNC_10; diff --git a/src/pokenav_match_call_2.c b/src/pokenav_match_call_2.c index d03bad88b8..4248826702 100755 --- a/src/pokenav_match_call_2.c +++ b/src/pokenav_match_call_2.c @@ -601,7 +601,7 @@ u32 DoMatchCallMessage(s32 taskState) return LT_PAUSE; PrintCallingDots(state); - PlaySE(SE_TOREEYE); + PlaySE(SE_POKENAV_CALL); state->unkE = 0; return LT_INC_AND_PAUSE; case 2: @@ -654,7 +654,7 @@ u32 sub_81CB888(s32 taskState) { case 0: if (!state->unkE) - PlaySE(SE_TOREOFF); + PlaySE(SE_POKENAV_HANG_UP); PlaySE(SE_SELECT); break; @@ -1126,7 +1126,7 @@ static void PrintMatchCallMessage(struct Pokenav4Struct *state) static bool32 WaitForMatchCallMessageText(struct Pokenav4Struct *state) { - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) gTextFlags.canABSpeedUpPrint = 1; else gTextFlags.canABSpeedUpPrint = 0; diff --git a/src/pokenav_menu_handler_1.c b/src/pokenav_menu_handler_1.c index bd33a21af3..6002d731bc 100644 --- a/src/pokenav_menu_handler_1.c +++ b/src/pokenav_menu_handler_1.c @@ -216,7 +216,7 @@ static u32 HandleMainMenuInput(struct Pokenav1Struct *state) if (UpdateMenuCursorPos(state)) return POKENAV_MENU_FUNC_MOVE_CURSOR; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sMenuItems[state->menuType][state->cursorPos]) { @@ -251,7 +251,7 @@ static u32 HandleMainMenuInput(struct Pokenav1Struct *state) } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return -1; return POKENAV_MENU_FUNC_NONE; @@ -263,7 +263,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav1Struct *state) if (UpdateMenuCursorPos(state)) return POKENAV_MENU_FUNC_MOVE_CURSOR; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (sMenuItems[state->menuType][state->cursorPos] == POKENAV_MENUITEM_MATCH_CALL) { @@ -273,14 +273,14 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav1Struct *state) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return POKENAV_MENU_FUNC_NONE; } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return POKENAV_MENU_FUNC_NONE; } @@ -293,12 +293,12 @@ static u32 HandleMainMenuInputEndTutorial(struct Pokenav1Struct *state) if (UpdateMenuCursorPos(state)) return POKENAV_MENU_FUNC_MOVE_CURSOR; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { u32 menuItem = sMenuItems[state->menuType][state->cursorPos]; if (menuItem != POKENAV_MENUITEM_MATCH_CALL && menuItem != POKENAV_MENUITEM_SWITCH_OFF) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return POKENAV_MENU_FUNC_NONE; } else if (menuItem == POKENAV_MENUITEM_MATCH_CALL) @@ -312,7 +312,7 @@ static u32 HandleMainMenuInputEndTutorial(struct Pokenav1Struct *state) return -1; } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { return -1; } @@ -329,7 +329,7 @@ static u32 HandleCantOpenRibbonsInput(struct Pokenav1Struct *state) return POKENAV_MENU_FUNC_MOVE_CURSOR; } - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { state->callback = GetMainMenuInputHandler(); return POKENAV_MENU_FUNC_RESHOW_DESCRIPTION; @@ -343,7 +343,7 @@ static u32 HandleConditionMenuInput(struct Pokenav1Struct *state) if (UpdateMenuCursorPos(state)) return POKENAV_MENU_FUNC_MOVE_CURSOR; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { switch (sMenuItems[state->menuType][state->cursorPos]) { @@ -363,7 +363,7 @@ static u32 HandleConditionMenuInput(struct Pokenav1Struct *state) return POKENAV_MENU_FUNC_RETURN_TO_MAIN; } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (state->cursorPos != sLastCursorPositions[state->menuType]) { @@ -387,7 +387,7 @@ static u32 HandleConditionSearchMenuInput(struct Pokenav1Struct *state) if (UpdateMenuCursorPos(state)) return POKENAV_MENU_FUNC_MOVE_CURSOR; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { u8 menuItem = sMenuItems[state->menuType][state->cursorPos]; if (menuItem != POKENAV_MENUITEM_CONDITION_SEARCH_CANCEL) @@ -404,7 +404,7 @@ static u32 HandleConditionSearchMenuInput(struct Pokenav1Struct *state) return POKENAV_MENU_FUNC_RETURN_TO_CONDITION; } } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (state->cursorPos != sLastCursorPositions[state->menuType]) { @@ -463,7 +463,7 @@ static void ReturnToConditionMenu(struct Pokenav1Struct *state) static bool32 UpdateMenuCursorPos(struct Pokenav1Struct *state) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { if (--state->cursorPos < 0) state->cursorPos = sLastCursorPositions[state->menuType]; @@ -471,7 +471,7 @@ static bool32 UpdateMenuCursorPos(struct Pokenav1Struct *state) state->currMenuItem = sMenuItems[state->menuType][state->cursorPos]; return TRUE; } - else if (gMain.newKeys & DPAD_DOWN) + else if (JOY_NEW(DPAD_DOWN)) { state->cursorPos++; if (state->cursorPos > sLastCursorPositions[state->menuType]) diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_2.c index 86ad8c7446..2be92013f4 100644 --- a/src/pokenav_menu_handler_2.c +++ b/src/pokenav_menu_handler_2.c @@ -465,7 +465,7 @@ static u32 LoopedTask_OpenMenu(s32 state) PokenavFadeScreen(1); else { - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); PokenavFadeScreen(3); } switch (GetPokenavMenuType()) @@ -675,7 +675,7 @@ static u32 LoopedTask_SelectRibbonsNoWinners(s32 state) switch (state) { case 0: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintNoRibbonWinners(); return LT_INC_AND_PAUSE; case 1: diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c index e858fad4a2..394b409076 100755 --- a/src/pokenav_region_map.c +++ b/src/pokenav_region_map.c @@ -219,7 +219,7 @@ static u32 HandleRegionMapInput(struct Pokenav5Struct *state) static u32 HandleRegionMapInputZoomDisabled(struct Pokenav5Struct *state) { - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { state->callback = GetExitRegionMapMenuId; return POKENAV_MAP_FUNC_EXIT; diff --git a/src/pokenav_ribbons_1.c b/src/pokenav_ribbons_1.c index aad0053a8d..fd47b27ad4 100644 --- a/src/pokenav_ribbons_1.c +++ b/src/pokenav_ribbons_1.c @@ -162,21 +162,21 @@ static u32 sub_81CFA68(struct PokenavSub9 *structPtr) static u32 sub_81CFA88(struct PokenavSub9 *structPtr) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return 1; - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) return 2; - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) return 3; - if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) return 4; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { structPtr->unk18 = 0; structPtr->unk0 = sub_81CFB08; return 5; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { structPtr->unk1C->unk2 = GetSelectedMatchCall(); structPtr->unk18 = 1; diff --git a/src/pokenav_ribbons_2.c b/src/pokenav_ribbons_2.c index e5a89acad3..6eabc9b335 100644 --- a/src/pokenav_ribbons_2.c +++ b/src/pokenav_ribbons_2.c @@ -188,26 +188,26 @@ void sub_81D04B8(void) u32 sub_81D04C4(struct PokenavSub13 *structPtr) { - if (gMain.newAndRepeatedKeys & DPAD_UP && structPtr->field_8->unk2 != 0) + if (JOY_REPEAT(DPAD_UP) && structPtr->field_8->unk2 != 0) { structPtr->field_8->unk2--; structPtr->field_C = 0; sub_81D0814(structPtr); return 1; } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN && structPtr->field_8->unk2 < structPtr->field_8->unk0 - 1) + if (JOY_REPEAT(DPAD_DOWN) && structPtr->field_8->unk2 < structPtr->field_8->unk0 - 1) { structPtr->field_8->unk2++; structPtr->field_C = 0; sub_81D0814(structPtr); return 1; } - else if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { structPtr->field_98 = sub_81D0548; return 2; } - else if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { structPtr->field_98 = sub_81D05D4; return 5; @@ -217,15 +217,15 @@ u32 sub_81D04C4(struct PokenavSub13 *structPtr) u32 sub_81D0548(struct PokenavSub13 *structPtr) { - if (gMain.newAndRepeatedKeys & DPAD_UP && sub_81D05DC(structPtr)) + if (JOY_REPEAT(DPAD_UP) && sub_81D05DC(structPtr)) return 3; - else if (gMain.newAndRepeatedKeys & DPAD_DOWN && sub_81D061C(structPtr)) + if (JOY_REPEAT(DPAD_DOWN) && sub_81D061C(structPtr)) return 3; - else if (gMain.newAndRepeatedKeys & DPAD_LEFT && sub_81D0664(structPtr)) + if (JOY_REPEAT(DPAD_LEFT) && sub_81D0664(structPtr)) return 3; - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT && sub_81D0688(structPtr)) + if (JOY_REPEAT(DPAD_RIGHT) && sub_81D0688(structPtr)) return 3; - else if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { structPtr->field_98 = sub_81D04C4; return 4; diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 986a2d3a20..063e6f3248 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -18,87 +18,139 @@ #include "constants/rgb.h" #include "random.h" -struct RaySceneStruct +/* + This file handles the cutscene showing Rayquaza arriving to settle the Groudon/Kyogre fight + It consists of 5 separate scenes: + - Groudon and Kyogre facing one another in a thunderstorm (RAY_ANIM_DUO_FIGHT) + - Over-the-shoulder of Rayquaza flying (RAY_ANIM_TAKES_FLIGHT) + - Rayquaza emerging from a spotlight down through the clouds (RAY_ANIM_DESCENDS) + - A close-up of Rayquaza flying down (RAY_ANIM_CHARGES) + - Rayquaza floating above Groudon/Kyogre as they back away offscreen (RAY_ANIM_CHASES_AWAY) + + A shortened version of the first scene is used when the player first arrives + in Sootopolis during the Groudon/Kyogre conflict, before awakening Rayquaza (RAY_ANIM_DUO_FIGHT_PRE) + This is indicated with the first two arguments to DoRayquazaScene +*/ + +enum { - MainCallback callback; - u8 tilemapBuffers[4][0x800]; - u16 field_2004; // set but unused - u8 animId; - bool8 onlyOneAnim; - s16 field_2008; - s16 field_200A; - u8 unusedFields[12]; // completely unused + RAY_ANIM_DUO_FIGHT_PRE, + RAY_ANIM_DUO_FIGHT, + RAY_ANIM_TAKES_FLIGHT, + RAY_ANIM_DESCENDS, + RAY_ANIM_CHARGES, + RAY_ANIM_CHASES_AWAY, + RAY_ANIM_END }; -// EWRAM vars -static EWRAM_DATA struct RaySceneStruct *sRayScene = NULL; +#define TAG_DUOFIGHT_GROUDON 30505 +#define TAG_DUOFIGHT_GROUDON_SHOULDER 30506 +#define TAG_DUOFIGHT_GROUDON_CLAW 30507 +#define TAG_DUOFIGHT_KYOGRE 30508 +#define TAG_DUOFIGHT_KYOGRE_PECTORAL_FIN 30509 +#define TAG_DUOFIGHT_KYOGRE_DORSAL_FIN 30510 +#define TAG_FLIGHT_SMOKE 30555 +#define TAG_DESCENDS_RAYQUAZA 30556 +#define TAG_DESCENDS_RAYQUAZA_TAIL 30557 +#define TAG_CHASE_GROUDON 30565 +#define TAG_CHASE_GROUDON_TAIL 30566 +#define TAG_CHASE_KYOGRE 30568 +#define TAG_CHASE_RAYQUAZA 30569 +#define TAG_CHASE_RAYQUAZA_TAIL 30570 +#define TAG_CHASE_SPLASH 30571 + +#define MAX_SMOKE 10 + +struct RayquazaScene +{ + MainCallback exitCallback; + u8 tilemapBuffers[4][BG_SCREEN_SIZE]; + u16 unk; // never read + u8 animId; + bool8 endEarly; + s16 revealedLightLine; + s16 revealedLightTimer; + u8 unused[12]; +}; + +static EWRAM_DATA struct RayquazaScene *sRayScene = NULL; -// this file's functions -static void Task_DuoFightAnim(u8 taskId); -static void Task_RayTakesFlightAnim(u8 taskId); -static void Task_RayDescendsAnim(u8 taskId); -static void Task_RayChargesAnim(u8 taskId); -static void Task_RayChasesAwayAnim(u8 taskId); -static void Task_HandleRayDescends(u8 taskId); -static void Task_RayDescendsEnd(u8 taskId); -static void Task_HandleRayCharges(u8 taskId); -static void sub_81D8AD8(u8 taskId); -static void sub_81D8B2C(u8 taskId); -static void Task_RayChargesEnd(u8 taskId); -static void Task_HandleRayChasesAway(u8 taskId); -static void sub_81D8FB0(u8 taskId); -static void sub_81D7228(u8 taskId); -static void Task_HandleDuoFight(u8 taskId); -static void sub_81D752C(u8 taskId); -static void Task_DuoFightEnd(u8 taskId); -static void Task_HandleRayTakesFlight(u8 taskId); -static void sub_81D81A4(u8 taskId); -static void Task_RayTakesFlightEnd(u8 taskId); -static void sub_81D94D4(u8 taskId); -static void sub_81D93D8(u8 taskId); -static void Task_RayChasesAwayEnd(u8 taskId); -static void sub_81D90A8(u8 taskId); -static void sub_81D98B4(u8 taskId); -static void Task_EndAfterFadeScreen(u8 taskId); static void CB2_InitRayquazaScene(void); static void CB2_RayquazaScene(void); -static void sub_81D750C(void); -static void sub_81D7438(void); -static void sub_81D7480(void); -static void sub_81D74C8(void); -static void sub_81D8BB4(void); -static void sub_81D6A20(struct Sprite *sprite); -static void sub_81D6D20(struct Sprite *sprite); -static void sub_81D7860(struct Sprite *sprite); -static void sub_81D7D14(struct Sprite *sprite); -static void sub_81D7700(struct Sprite *sprite); -static void sub_81D7A60(struct Sprite *sprite); -static void sub_81D874C(struct Sprite *sprite); -static void sub_81D9338(struct Sprite *sprite); -static void sub_81D9420(struct Sprite *sprite); -static void sub_81D8260(struct Sprite *sprite); -static void sub_81D961C(struct Sprite *sprite); -static void sub_81D97E0(struct Sprite *sprite); -static void sub_81D9528(struct Sprite *sprite); -static u8 sub_81D7664(void); -static u8 sub_81D78BC(void); -static u8 sub_81D86CC(void); -static void DuoFightEnd(u8 taskId, s8 palDelay); -static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y); +static void Task_EndAfterFadeScreen(u8); + +// RAY_ANIM_DUO_FIGHT_PRE / RAY_ANIM_DUO_FIGHT +static void Task_DuoFightAnim(u8); +static void Task_HandleDuoFight(u8); +static void Task_DuoFightEnd(u8); +static void DuoFightEnd(u8, s8); +static void Task_DuoFight_AnimateClouds(u8); +static void DuoFight_PanOffScene(u8); +static void DuoFight_AnimateRain(void); +static void DuoFight_Lightning1(void); +static void DuoFight_Lightning2(void); +static void DuoFight_LightningLong(void); +static u8 DuoFightPre_CreateGroudonSprites(void); +static u8 DuoFightPre_CreateKyogreSprites(void); +static u8 DuoFight_CreateGroudonSprites(void); +static u8 DuoFight_CreateKyogreSprites(void); +static void SpriteCB_DuoFightPre_Groudon(struct Sprite *); +static void SpriteCB_DuoFightPre_Kyogre(struct Sprite *); +static void SpriteCB_DuoFight_Groudon(struct Sprite *); +static void SpriteCB_DuoFight_Kyogre(struct Sprite *); +static void DuoFight_SlideGroudonDown(struct Sprite *); +static void DuoFight_SlideKyogreDown(struct Sprite *); + +// RAY_ANIM_TAKES_FLIGHT +static void Task_RayTakesFlightAnim(u8); +static void Task_HandleRayTakesFlight(u8); +static void Task_RayTakesFlightEnd(u8); +static void Task_TakesFlight_CreateSmoke(u8); +static void SpriteCB_TakesFlight_Smoke(struct Sprite *); + +// RAY_ANIM_DESCENDS +static void Task_RayDescendsAnim(u8); +static void Task_HandleRayDescends(u8); +static void Task_RayDescendsEnd(u8); +static u8 CreateDescendsRayquazaSprite(void); +static void SpriteCB_Descends_Rayquaza(struct Sprite *); + +// RAY_ANIM_CHARGES +static void Task_RayChargesAnim(u8); +static void Task_HandleRayCharges(u8); +static void Task_RayChargesEnd(u8); +static void Task_RayCharges_ShakeRayquaza(u8); +static void Task_RayCharges_FlyOffscreen(u8); +static void RayCharges_AnimateBg(void); + +// RAY_ANIM_CHASES_AWAY +static void Task_RayChasesAwayAnim(u8); +static void Task_HandleRayChasesAway(u8); +static void Task_RayChasesAwayEnd(u8); +static void Task_ChasesAway_AnimateBg(u8); +static void ChasesAway_KyogreStartLeave(u8); +static void ChasesAway_GroudonStartLeave(u8); +static void ChasesAway_CreateTrioSprites(u8); +static void Task_ChasesAway_AnimateRing(u8); +static void SpriteCB_ChasesAway_GroudonLeave(struct Sprite *); +static void SpriteCB_ChasesAway_KyogreLeave(struct Sprite *); +static void SpriteCB_ChasesAway_RayquazaFloat(struct Sprite *); +static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *); +static void SpriteCB_ChasesAway_DuoRingPush(struct Sprite *); +static void ChasesAway_SetRayquazaAnim(struct Sprite *, u8, s16, s16); -// const rom data static const TaskFunc sTasksForAnimations[] = { [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim, - [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, - [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, - [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, - [RAY_ANIM_CHARGES] = Task_RayChargesAnim, - [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim, - [RAY_ANIM_END] = Task_EndAfterFadeScreen, + [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, + [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, + [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, + [RAY_ANIM_CHARGES] = Task_RayChargesAnim, + [RAY_ANIM_CHASES_AWAY] = Task_RayChasesAwayAnim, + [RAY_ANIM_END] = Task_EndAfterFadeScreen, }; -static const struct OamData sOamData_862A6BC = +static const struct OamData sOam_64x64 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -115,7 +167,7 @@ static const struct OamData sOamData_862A6BC = .affineParam = 0 }; -static const struct OamData sOamData_862A6C4 = +static const struct OamData sOam_32x32 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -132,7 +184,7 @@ static const struct OamData sOamData_862A6C4 = .affineParam = 0 }; -static const struct OamData sOamData_862A6CC = +static const struct OamData sOam_64x32 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -149,7 +201,7 @@ static const struct OamData sOamData_862A6CC = .affineParam = 0 }; -static const struct OamData sOamData_862A6D4 = +static const struct OamData sOam_32x16 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -166,7 +218,7 @@ static const struct OamData sOamData_862A6D4 = .affineParam = 0 }; -static const struct OamData sOamData_862A6DC = +static const struct OamData sOam_16x8 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -183,7 +235,7 @@ static const struct OamData sOamData_862A6DC = .affineParam = 0 }; -static const struct OamData sOamData_862A6E4 = +static const struct OamData sOam_16x32 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -200,7 +252,7 @@ static const struct OamData sOamData_862A6E4 = .affineParam = 0 }; -static const struct OamData sOamData_862A6EC = +static const struct OamData sOam_16x16 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -217,7 +269,7 @@ static const struct OamData sOamData_862A6EC = .affineParam = 0 }; -static const struct OamData sOamData_862A6F4 = +static const struct OamData sOam_32x8 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -234,7 +286,7 @@ static const struct OamData sOamData_862A6F4 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_862A6FC[] = +static const union AnimCmd sAnim_DuoFightPre_Groudon_Head[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(64, 30), @@ -243,7 +295,7 @@ static const union AnimCmd sSpriteAnim_862A6FC[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A710[] = +static const union AnimCmd sAnim_DuoFightPre_Groudon_Body[] = { ANIMCMD_FRAME(192, 30), ANIMCMD_FRAME(256, 30), @@ -252,104 +304,104 @@ static const union AnimCmd sSpriteAnim_862A710[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862A724[] = +static const union AnimCmd *const sAnims_DuoFightPre_Groudon[] = { - sSpriteAnim_862A6FC, - sSpriteAnim_862A710 + sAnim_DuoFightPre_Groudon_Head, + sAnim_DuoFightPre_Groudon_Body }; -static const struct SpriteTemplate sUnknown_0862A72C = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_Groudon = { - .tileTag = 30505, - .paletteTag = 30505, - .oam = &sOamData_862A6BC, - .anims = sSpriteAnimTable_862A724, + .tileTag = TAG_DUOFIGHT_GROUDON, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_64x64, + .anims = sAnims_DuoFightPre_Groudon, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A744[] = +static const union AnimCmd sAnim_DuoFightPre_GroudonShoulderKyogreDorsalFin[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862A74C[] = +static const union AnimCmd *const sAnims_DuoFightPre_GroudonShoulderKyogreDorsalFin[] = { - sSpriteAnim_862A744 + sAnim_DuoFightPre_GroudonShoulderKyogreDorsalFin }; -static const struct SpriteTemplate sUnknown_0862A750 = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_GroudonShoulder = { - .tileTag = 30506, - .paletteTag = 30505, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862A74C, + .tileTag = TAG_DUOFIGHT_GROUDON_SHOULDER, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_32x32, + .anims = sAnims_DuoFightPre_GroudonShoulderKyogreDorsalFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A768[] = +static const union AnimCmd sAnim_DuoFightPre_GroudonClaw[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862A770[] = +static const union AnimCmd *const sAnims_DuoFightPre_GroudonClaw[] = { - sSpriteAnim_862A768 + sAnim_DuoFightPre_GroudonClaw }; -static const struct SpriteTemplate sUnknown_0862A774 = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_GroudonClaw = { - .tileTag = 30507, - .paletteTag = 30505, - .oam = &sOamData_862A6CC, - .anims = sSpriteAnimTable_862A770, + .tileTag = TAG_DUOFIGHT_GROUDON_CLAW, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_64x32, + .anims = sAnims_DuoFightPre_GroudonClaw, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A78C[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_TopLeft[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A794[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_TopRight[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A79C[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_FaceLeft[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A7A4[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_FaceRight[] = { ANIMCMD_FRAME(24, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A7AC[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_ChinLeft[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A7B4[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_ChinRight[] = { ANIMCMD_FRAME(40, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A7BC[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_LeftPectoralFin[] = { ANIMCMD_FRAME(48, 36), ANIMCMD_FRAME(64, 36), @@ -358,7 +410,7 @@ static const union AnimCmd sSpriteAnim_862A7BC[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A7D0[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_LeftShoulder[] = { ANIMCMD_FRAME(56, 36), ANIMCMD_FRAME(72, 36), @@ -367,7 +419,7 @@ static const union AnimCmd sSpriteAnim_862A7D0[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A7E4[] = +static const union AnimCmd sAnim_DuoFightPre_Kyogre_RightShoulder[] = { ANIMCMD_FRAME(96, 36), ANIMCMD_FRAME(104, 36), @@ -376,31 +428,32 @@ static const union AnimCmd sSpriteAnim_862A7E4[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862A7F8[] = +// Edge of the right pectoral fin is its own sprite (see KyogrePectoralFin) +static const union AnimCmd *const sAnims_DuoFightPre_Kyogre[] = { - sSpriteAnim_862A78C, - sSpriteAnim_862A794, - sSpriteAnim_862A79C, - sSpriteAnim_862A7A4, - sSpriteAnim_862A7AC, - sSpriteAnim_862A7B4, - sSpriteAnim_862A7BC, - sSpriteAnim_862A7D0, - sSpriteAnim_862A7E4 + sAnim_DuoFightPre_Kyogre_TopLeft, + sAnim_DuoFightPre_Kyogre_TopRight, + sAnim_DuoFightPre_Kyogre_FaceLeft, + sAnim_DuoFightPre_Kyogre_FaceRight, + sAnim_DuoFightPre_Kyogre_ChinLeft, + sAnim_DuoFightPre_Kyogre_ChinRight, + sAnim_DuoFightPre_Kyogre_LeftPectoralFin, + sAnim_DuoFightPre_Kyogre_LeftShoulder, + sAnim_DuoFightPre_Kyogre_RightShoulder }; -static const struct SpriteTemplate sUnknown_0862A81C = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_Kyogre = { - .tileTag = 30508, - .paletteTag = 30508, - .oam = &sOamData_862A6D4, - .anims = sSpriteAnimTable_862A7F8, + .tileTag = TAG_DUOFIGHT_KYOGRE, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_32x16, + .anims = sAnims_DuoFightPre_Kyogre, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A834[] = +static const union AnimCmd sAnim_DuoFightPre_KyogrePectoralFin[] = { ANIMCMD_FRAME(0, 36), ANIMCMD_FRAME(2, 36), @@ -409,41 +462,41 @@ static const union AnimCmd sSpriteAnim_862A834[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862A848[] = +static const union AnimCmd *const sAnims_DuoFightPre_KyogrePectoralFin[] = { - sSpriteAnim_862A834 + sAnim_DuoFightPre_KyogrePectoralFin }; -static const struct SpriteTemplate sUnknown_0862A84C = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_KyogrePectoralFin = { - .tileTag = 30509, - .paletteTag = 30508, - .oam = &sOamData_862A6DC, - .anims = sSpriteAnimTable_862A848, + .tileTag = TAG_DUOFIGHT_KYOGRE_PECTORAL_FIN, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_16x8, + .anims = sAnims_DuoFightPre_KyogrePectoralFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862A864 = +static const struct SpriteTemplate sSpriteTemplate_DuoFightPre_KyogreDorsalFin = { - .tileTag = 30510, - .paletteTag = 30508, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862A74C, + .tileTag = TAG_DUOFIGHT_KYOGRE_DORSAL_FIN, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_32x32, + .anims = sAnims_DuoFightPre_GroudonShoulderKyogreDorsalFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct ScanlineEffectParams sUnknown_0862A87C = +static const struct ScanlineEffectParams sScanlineParams_DuoFight_Clouds = { .dmaDest = (vu16 *)REG_ADDR_BG1HOFS, - .dmaControl = 0xA2600001, + .dmaControl = SCANLINE_EFFECT_DMACNT_16BIT, .initState = 1 }; -static const struct BgTemplate sUnknown_0862A888[] = +static const struct BgTemplate sBgTemplates_DuoFight[] = { { .bg = 0, @@ -474,7 +527,7 @@ static const struct BgTemplate sUnknown_0862A888[] = }, }; -static const union AnimCmd sSpriteAnim_862A894[] = +static const union AnimCmd sAnim_DuoFight_Groudon_Head[] = { ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(64, 20), @@ -483,7 +536,7 @@ static const union AnimCmd sSpriteAnim_862A894[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A8A8[] = +static const union AnimCmd sAnim_DuoFight_Groudon_Body[] = { ANIMCMD_FRAME(192, 20), ANIMCMD_FRAME(256, 20), @@ -492,124 +545,124 @@ static const union AnimCmd sSpriteAnim_862A8A8[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862A8BC[] = +static const union AnimCmd *const sAnims_DuoFight_Groudon[] = { - sSpriteAnim_862A894, - sSpriteAnim_862A8A8 + sAnim_DuoFight_Groudon_Head, + sAnim_DuoFight_Groudon_Body }; -static const struct CompressedSpriteSheet sUnknown_0862A8C4 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_Groudon = { - gRaySceneGroudon_Gfx, 0x3000, 30505 + gRaySceneDuoFight_Groudon_Gfx, 0x3000, TAG_DUOFIGHT_GROUDON }; -static const struct CompressedSpritePalette sUnknown_0862A8CC = +static const struct CompressedSpritePalette sSpritePal_DuoFight_Groudon = { - gRaySceneGroudon_Pal, 30505 + gRaySceneDuoFight_Groudon_Pal, TAG_DUOFIGHT_GROUDON }; -static const struct SpriteTemplate sUnknown_0862A8D4 = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_Groudon = { - .tileTag = 30505, - .paletteTag = 30505, - .oam = &sOamData_862A6BC, - .anims = sSpriteAnimTable_862A8BC, + .tileTag = TAG_DUOFIGHT_GROUDON, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_64x64, + .anims = sAnims_DuoFight_Groudon, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A8EC[] = +static const union AnimCmd sAnim_DuoFight_GroudonShoulderKyogreDorsalFin[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862A8F4[] = +static const union AnimCmd *const sAnims_DuoFight_GroudonShoulderKyogreDorsalFin[] = { - sSpriteAnim_862A8EC + sAnim_DuoFight_GroudonShoulderKyogreDorsalFin }; -static const struct CompressedSpriteSheet sUnknown_0862A8F8 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_GroudonShoulder = { - gRaySceneGroudon2_Gfx, 0x200, 30506 + gRaySceneDuoFight_GroudonShoulder_Gfx, 0x200, TAG_DUOFIGHT_GROUDON_SHOULDER }; -static const struct SpriteTemplate sUnknown_0862A900 = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_GroudonShoulder = { - .tileTag = 30506, - .paletteTag = 30505, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862A8F4, + .tileTag = TAG_DUOFIGHT_GROUDON_SHOULDER, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_32x32, + .anims = sAnims_DuoFight_GroudonShoulderKyogreDorsalFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A918[] = +static const union AnimCmd sAnim_DuoFight_GroudonClaw[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862A920[] = +static const union AnimCmd *const sAnims_DuoFight_GroudonClaw[] = { - sSpriteAnim_862A918 + sAnim_DuoFight_GroudonClaw }; -static const struct CompressedSpriteSheet sUnknown_0862A924 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_GroudonClaw = { - gRaySceneGroudon3_Gfx, 0x400, 30507 + gRaySceneDuoFight_GroudonClaw_Gfx, 0x400, TAG_DUOFIGHT_GROUDON_CLAW }; -static const struct SpriteTemplate sUnknown_0862A92C = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_GroudonClaw = { - .tileTag = 30507, - .paletteTag = 30505, - .oam = &sOamData_862A6CC, - .anims = sSpriteAnimTable_862A920, + .tileTag = TAG_DUOFIGHT_GROUDON_CLAW, + .paletteTag = TAG_DUOFIGHT_GROUDON, + .oam = &sOam_64x32, + .anims = sAnims_DuoFight_GroudonClaw, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A944[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_TopLeft[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A94C[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_TopRight[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A954[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_FaceLeft[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A95C[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_FaceRight[] = { ANIMCMD_FRAME(24, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A964[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_ChinLeft[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A96C[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_ChinRight[] = { ANIMCMD_FRAME(40, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862A974[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_LeftPectoralFin[] = { ANIMCMD_FRAME(48, 24), ANIMCMD_FRAME(64, 24), @@ -618,7 +671,7 @@ static const union AnimCmd sSpriteAnim_862A974[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A988[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_LeftShoulder[] = { ANIMCMD_FRAME(56, 24), ANIMCMD_FRAME(72, 24), @@ -627,7 +680,7 @@ static const union AnimCmd sSpriteAnim_862A988[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd sSpriteAnim_862A99C[] = +static const union AnimCmd sAnim_DuoFight_Kyogre_RightShoulder[] = { ANIMCMD_FRAME(96, 24), ANIMCMD_FRAME(104, 24), @@ -636,41 +689,41 @@ static const union AnimCmd sSpriteAnim_862A99C[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862A9B0[] = +static const union AnimCmd *const sAnims_DuoFight_Kyogre[] = { - sSpriteAnim_862A944, - sSpriteAnim_862A94C, - sSpriteAnim_862A954, - sSpriteAnim_862A95C, - sSpriteAnim_862A964, - sSpriteAnim_862A96C, - sSpriteAnim_862A974, - sSpriteAnim_862A988, - sSpriteAnim_862A99C + sAnim_DuoFight_Kyogre_TopLeft, + sAnim_DuoFight_Kyogre_TopRight, + sAnim_DuoFight_Kyogre_FaceLeft, + sAnim_DuoFight_Kyogre_FaceRight, + sAnim_DuoFight_Kyogre_ChinLeft, + sAnim_DuoFight_Kyogre_ChinRight, + sAnim_DuoFight_Kyogre_LeftPectoralFin, + sAnim_DuoFight_Kyogre_LeftShoulder, + sAnim_DuoFight_Kyogre_RightShoulder }; -static const struct CompressedSpriteSheet sUnknown_0862A9D4 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_Kyogre = { - gRaySceneKyogre_Gfx, 0xF00, 30508 + gRaySceneDuoFight_Kyogre_Gfx, 0xF00, TAG_DUOFIGHT_KYOGRE }; -static const struct CompressedSpritePalette sUnknown_0862A9DC = +static const struct CompressedSpritePalette sSpritePal_DuoFight_Kyogre = { - gRaySceneKyogre_Pal, 30508 + gRaySceneDuoFight_Kyogre_Pal, TAG_DUOFIGHT_KYOGRE }; -static const struct SpriteTemplate sUnknown_0862A9E4 = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_Kyogre = { - .tileTag = 30508, - .paletteTag = 30508, - .oam = &sOamData_862A6D4, - .anims = sSpriteAnimTable_862A9B0, + .tileTag = TAG_DUOFIGHT_KYOGRE, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_32x16, + .anims = sAnims_DuoFight_Kyogre, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AnimCmd sSpriteAnim_862A9FC[] = +static const union AnimCmd sAnim_DuoFight_KyogrePectoralFin[] = { ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(2, 24), @@ -679,44 +732,44 @@ static const union AnimCmd sSpriteAnim_862A9FC[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862AA10[] = +static const union AnimCmd *const sAnims_DuoFight_KyogrePectoralFin[] = { - sSpriteAnim_862A9FC + sAnim_DuoFight_KyogrePectoralFin }; -static const struct CompressedSpriteSheet sUnknown_0862AA14 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_KyogrePectoralFin = { - gRaySceneKyogre2_Gfx, 0xC0, 30509 + gRaySceneDuoFight_KyogrePectoralFin_Gfx, 0xC0, TAG_DUOFIGHT_KYOGRE_PECTORAL_FIN }; -static const struct SpriteTemplate sUnknown_0862AA1C = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_KyogrePectoralFin = { - .tileTag = 30509, - .paletteTag = 30508, - .oam = &sOamData_862A6DC, - .anims = sSpriteAnimTable_862AA10, + .tileTag = TAG_DUOFIGHT_KYOGRE_PECTORAL_FIN, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_16x8, + .anims = sAnims_DuoFight_KyogrePectoralFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct CompressedSpriteSheet sUnknown_0862AA34 = +static const struct CompressedSpriteSheet sSpriteSheet_DuoFight_KyogreDorsalFin = { - gRaySceneKyogre3_Gfx, 0x200, 30510 + gRaySceneDuoFight_KyogreDorsalFin_Gfx, 0x200, TAG_DUOFIGHT_KYOGRE_DORSAL_FIN }; -static const struct SpriteTemplate sUnknown_0862AA3C = +static const struct SpriteTemplate sSpriteTemplate_DuoFight_KyogreDorsalFin = { - .tileTag = 30510, - .paletteTag = 30508, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862A8F4, + .tileTag = TAG_DUOFIGHT_KYOGRE_DORSAL_FIN, + .paletteTag = TAG_DUOFIGHT_KYOGRE, + .oam = &sOam_32x32, + .anims = sAnims_DuoFight_GroudonShoulderKyogreDorsalFin, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct BgTemplate sUnknown_0862AA54[] = +static const struct BgTemplate sBgTemplates_TakesFlight[] = { { .bg = 0, @@ -747,18 +800,18 @@ static const struct BgTemplate sUnknown_0862AA54[] = } }; -static const union AnimCmd sSpriteAnim_862AA60[] = +static const union AnimCmd sAnim_TakesFlight_Smoke[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862AA68[] = +static const union AnimCmd *const sAnims_TakesFlight_Smoke[] = { - sSpriteAnim_862AA60 + sAnim_TakesFlight_Smoke }; -static const union AffineAnimCmd sSpriteAffineAnim_862AA6C[] = +static const union AffineAnimCmd sAffineAnim_TakesFlight_Smoke[] = { AFFINEANIMCMD_FRAME(-64, -64, 0, 1), AFFINEANIMCMD_FRAME(32, 32, 0, 14), @@ -766,47 +819,47 @@ static const union AffineAnimCmd sSpriteAffineAnim_862AA6C[] = AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] = +static const union AffineAnimCmd *const sAffineAnims_TakesFlight_Smoke[] = { - sSpriteAffineAnim_862AA6C + sAffineAnim_TakesFlight_Smoke }; -static const struct CompressedSpriteSheet sUnknown_0862AA90 = +static const struct CompressedSpriteSheet sSpriteSheet_TakesFlight_Smoke = { - gRaySceneSmoke_Gfx, 0x100, 30555 + gRaySceneTakesFlight_Smoke_Gfx, 0x100, TAG_FLIGHT_SMOKE }; -static const struct CompressedSpritePalette sUnknown_0862AA98 = +static const struct CompressedSpritePalette sSpritePal_TakesFlight_Smoke = { - gRaySceneSmoke_Pal, 30555 + gRaySceneTakesFlight_Smoke_Pal, TAG_FLIGHT_SMOKE }; -static const struct SpriteTemplate sUnknown_0862AAA0 = +static const struct SpriteTemplate sSpriteTemplate_TakesFlight_Smoke = { - .tileTag = 30555, - .paletteTag = 30555, - .oam = &sOamData_862A6D4, - .anims = sSpriteAnimTable_862AA68, + .tileTag = TAG_FLIGHT_SMOKE, + .paletteTag = TAG_FLIGHT_SMOKE, + .oam = &sOam_32x16, + .anims = sAnims_TakesFlight_Smoke, .images = NULL, - .affineAnims = sSpriteAffineAnimTable_862AA8C, - .callback = sub_81D8260, + .affineAnims = sAffineAnims_TakesFlight_Smoke, + .callback = SpriteCB_TakesFlight_Smoke, }; -static const s8 sUnknown_0862AAB8[][2] = +static const s8 sTakesFlight_SmokeCoords[MAX_SMOKE][2] = { - {-1, 5}, - {-3, -4}, - {5, -3}, - {-7, 2}, - {-9, -1}, - {1, -5}, - {3, 4}, - {-5, 3}, - {7, -2}, - {9, 1} + {-1, 5}, + {-3, -4}, + { 5, -3}, + {-7, 2}, + {-9, -1}, + { 1, -5}, + { 3, 4}, + {-5, 3}, + { 7, -2}, + { 9, 1} }; -static const struct BgTemplate sUnknown_0862AACC[] = +static const struct BgTemplate sBgTemplates_Descends[] = { { .bg = 0, @@ -846,68 +899,68 @@ static const struct BgTemplate sUnknown_0862AACC[] = } }; -static const union AnimCmd sSpriteAnim_862AADC[] = +static const union AnimCmd sAnim_Descends_Rayquaza[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_FRAME(64, 32), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862AAE8[] = +static const union AnimCmd *const sAnims_Descends_Rayquaza[] = { - sSpriteAnim_862AADC + sAnim_Descends_Rayquaza }; -static const union AnimCmd sSpriteAnim_862AAEC[] = +static const union AnimCmd sAnim_Descends_RayquazaTail[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_FRAME(8, 32), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sSpriteAnimTable_862AAF8[] = +static const union AnimCmd *const sAnims_Descends_RayquazaTail[] = { - sSpriteAnim_862AAEC + sAnim_Descends_RayquazaTail }; -static const struct CompressedSpriteSheet sUnknown_0862AAFC = +static const struct CompressedSpriteSheet sSpriteSheet_Descends_Rayquaza = { - gRaySceneRayquazaFly1_Gfx, 0x1000, 30556 + gRaySceneDescends_Rayquaza_Gfx, 0x1000, TAG_DESCENDS_RAYQUAZA }; -static const struct CompressedSpriteSheet sUnknown_0862AB04 = +static const struct CompressedSpriteSheet sSpriteSheet_Descends_RayquazaTail = { - gRaySceneRayquazaTail_Gfx, 0x200, 30557 + gRaySceneDescends_RayquazaTail_Gfx, 0x200, TAG_DESCENDS_RAYQUAZA_TAIL }; -static const struct CompressedSpritePalette sUnknown_0862AB0C = +static const struct CompressedSpritePalette sSpritePal_Descends_Rayquaza = { - gRaySceneRayquaza_Pal, 30556 + gRaySceneTakesFlight_Rayquaza_Pal, TAG_DESCENDS_RAYQUAZA // "Takes flight" palette re-used here }; -static const struct SpriteTemplate sUnknown_0862AB14 = +static const struct SpriteTemplate sSpriteTemplate_Descends_Rayquaza = { - .tileTag = 30556, - .paletteTag = 30556, - .oam = &sOamData_862A6BC, - .anims = sSpriteAnimTable_862AAE8, + .tileTag = TAG_DESCENDS_RAYQUAZA, + .paletteTag = TAG_DESCENDS_RAYQUAZA, + .oam = &sOam_64x64, + .anims = sAnims_Descends_Rayquaza, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862AB2C = +static const struct SpriteTemplate sSpriteTemplate_Descends_RayquazaTail = { - .tileTag = 30557, - .paletteTag = 30556, - .oam = &sOamData_862A6E4, - .anims = sSpriteAnimTable_862AAF8, + .tileTag = TAG_DESCENDS_RAYQUAZA_TAIL, + .paletteTag = TAG_DESCENDS_RAYQUAZA, + .oam = &sOam_16x32, + .anims = sAnims_Descends_RayquazaTail, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct BgTemplate sUnknown_0862AB44[] = +static const struct BgTemplate sBgTemplates_Charges[] = { { .bg = 0, @@ -947,13 +1000,13 @@ static const struct BgTemplate sUnknown_0862AB44[] = } }; -static const union AnimCmd sSpriteAnim_862AB54[] = +static const union AnimCmd sAnim_ChasesAway_Groudon_Still[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862AB5C[] = +static const union AnimCmd sAnim_ChasesAway_Groudon_Moving[] = { ANIMCMD_FRAME(0, 48), ANIMCMD_FRAME(64, 32), @@ -962,113 +1015,113 @@ static const union AnimCmd sSpriteAnim_862AB5C[] = ANIMCMD_JUMP(0) }; -static const union AnimCmd *const sSpriteAnimTable_862AB70[] = +static const union AnimCmd *const sAnims_ChasesAway_Groudon[] = { - sSpriteAnim_862AB54, - sSpriteAnim_862AB5C + sAnim_ChasesAway_Groudon_Still, + sAnim_ChasesAway_Groudon_Moving }; -static const union AnimCmd sSpriteAnim_862AB78[] = +static const union AnimCmd sAnim_ChasesAway_GroudonTail[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862AB80[] = +static const union AnimCmd *const sAnims_ChasesAway_GroudonTail[] = { - sSpriteAnim_862AB78, + sAnim_ChasesAway_GroudonTail, }; -static const union AnimCmd sSpriteAnim_862AB84[] = +static const union AnimCmd sAnim_ChasesAway_Kyogre_Front[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862AB8C[] = +static const union AnimCmd sAnim_ChasesAway_Kyogre_Back[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862AB94[] = +static const union AnimCmd sAnim_ChasesAway_Kyogre_Tail[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862AB9C[] = +static const union AnimCmd *const sAnims_ChasesAway_Kyogre[] = { - sSpriteAnim_862AB84, - sSpriteAnim_862AB8C, - sSpriteAnim_862AB94 + sAnim_ChasesAway_Kyogre_Front, + sAnim_ChasesAway_Kyogre_Back, + sAnim_ChasesAway_Kyogre_Tail }; -static const union AnimCmd sSpriteAnim_862ABA8[] = +static const union AnimCmd sAnim_ChasesAway_Rayquaza_FlyingDown[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABB0[] = +static const union AnimCmd sAnim_ChasesAway_Rayquaza_Arriving[] = { ANIMCMD_FRAME(64, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABB8[] = +static const union AnimCmd sAnim_ChasesAway_Rayquaza_Floating[] = { ANIMCMD_FRAME(128, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABC0[] = +static const union AnimCmd sAnim_ChasesAway_Rayquaza_Shouting[] = { ANIMCMD_FRAME(192, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862ABC8[] = +static const union AnimCmd *const sAnims_ChasesAway_Rayquaza[] = { - sSpriteAnim_862ABA8, - sSpriteAnim_862ABB0, - sSpriteAnim_862ABB8, - sSpriteAnim_862ABC0 + sAnim_ChasesAway_Rayquaza_FlyingDown, + sAnim_ChasesAway_Rayquaza_Arriving, + sAnim_ChasesAway_Rayquaza_Floating, + sAnim_ChasesAway_Rayquaza_Shouting }; -static const union AnimCmd sSpriteAnim_862ABD8[] = +static const union AnimCmd sAnim_ChasesAway_RayquazaTail_FlyingDown[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABE0[] = +static const union AnimCmd sAnim_ChasesAway_RayquazaTail_Arriving[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABE8[] = +static const union AnimCmd sAnim_ChasesAway_RayquazaTail_Floating[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_862ABF0[] = +static const union AnimCmd sAnim_ChasesAway_RayquazaTail_Shouting[] = { ANIMCMD_FRAME(48, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_862ABF8[] = +static const union AnimCmd *const sAnims_ChasesAway_RayquazaTail[] = { - sSpriteAnim_862ABD8, - sSpriteAnim_862ABE0, - sSpriteAnim_862ABE8, - sSpriteAnim_862ABF0 + sAnim_ChasesAway_RayquazaTail_FlyingDown, + sAnim_ChasesAway_RayquazaTail_Arriving, + sAnim_ChasesAway_RayquazaTail_Floating, + sAnim_ChasesAway_RayquazaTail_Shouting }; -static const union AnimCmd sSpriteAnim_862AC08[] = +static const union AnimCmd sAnim_ChasesAway_KyogreSplash[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(4, 8), @@ -1079,128 +1132,128 @@ static const union AnimCmd sSpriteAnim_862AC08[] = ANIMCMD_JUMP(0) }; -static const union AnimCmd *const sSpriteAnimTable_862AC24[] = +static const union AnimCmd *const sAnims_ChasesAway_KyogreSplash[] = { - sSpriteAnim_862AC08 + sAnim_ChasesAway_KyogreSplash }; -static const struct CompressedSpriteSheet sUnknown_0862AC28 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_Groudon = { - gRaySceneGroudonLeft_Gfx, 0x1800, 30565 + gRaySceneChasesAway_Groudon_Gfx, 0x1800, TAG_CHASE_GROUDON }; -static const struct CompressedSpriteSheet sUnknown_0862AC30 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_GroudonTail = { - gRaySceneGroudonTail_Gfx, 0x80, 30566 + gRaySceneChasesAway_GroudonTail_Gfx, 0x80, TAG_CHASE_GROUDON_TAIL }; -static const struct CompressedSpriteSheet sUnknown_0862AC38 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_Kyogre = { - gRaySceneKyogreRight_Gfx, 0x600, 30568 + gRaySceneChasesAway_Kyogre_Gfx, 0x600, TAG_CHASE_KYOGRE }; -static const struct CompressedSpriteSheet sUnknown_0862AC40 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_Rayquaza = { - gRaySceneRayquazaHover_Gfx, 0x2000, 30569 + gRaySceneChasesAway_Rayquaza_Gfx, 0x2000, TAG_CHASE_RAYQUAZA }; -static const struct CompressedSpriteSheet sUnknown_0862AC48 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_RayquazaTail = { - gRaySceneRayquazaFlyIn_Gfx, 0x800, 30570 + gRaySceneChasesAway_RayquazaTail_Gfx, 0x800, TAG_CHASE_RAYQUAZA_TAIL }; -static const struct CompressedSpriteSheet sUnknown_0862AC50 = +static const struct CompressedSpriteSheet sSpriteSheet_ChasesAway_KyogreSplash = { - gRaySceneSplash_Gfx, 0x300, 30571 + gRaySceneChasesAway_KyogreSplash_Gfx, 0x300, TAG_CHASE_SPLASH }; -static const struct CompressedSpritePalette sUnknown_0862AC58 = +static const struct CompressedSpritePalette sSpritePal_ChasesAway_Groudon = { - gRaySceneGroudonLeft_Pal, 30565 + gRaySceneChasesAway_Groudon_Pal, TAG_CHASE_GROUDON }; -static const struct CompressedSpritePalette sUnknown_0862AC60 = +static const struct CompressedSpritePalette sSpritePal_ChasesAway_Kyogre = { - gRaySceneKyogreRight_Pal, 30568 + gRaySceneChasesAway_Kyogre_Pal, TAG_CHASE_KYOGRE }; -static const struct CompressedSpritePalette sUnknown_0862AC68 = +static const struct CompressedSpritePalette sSpritePal_ChasesAway_Rayquaza = { - gRaySceneRayquazaHover_Pal, 30569 + gRaySceneChasesAway_Rayquaza_Pal, TAG_CHASE_RAYQUAZA }; -static const struct CompressedSpritePalette sUnknown_0862AC70 = +static const struct CompressedSpritePalette sSpritePal_ChasesAway_KyogreSplash = { - gRaySceneSplash_Pal, 30571 + gRaySceneChasesAway_KyogreSplash_Pal, TAG_CHASE_SPLASH }; -static const struct SpriteTemplate sUnknown_0862AC78 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_Groudon = { - .tileTag = 30565, - .paletteTag = 30565, - .oam = &sOamData_862A6BC, - .anims = sSpriteAnimTable_862AB70, + .tileTag = TAG_CHASE_GROUDON, + .paletteTag = TAG_CHASE_GROUDON, + .oam = &sOam_64x64, + .anims = sAnims_ChasesAway_Groudon, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862AC90 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_GroudonTail = { - .tileTag = 30566, - .paletteTag = 30565, - .oam = &sOamData_862A6EC, - .anims = sSpriteAnimTable_862AB80, + .tileTag = TAG_CHASE_GROUDON_TAIL, + .paletteTag = TAG_CHASE_GROUDON, + .oam = &sOam_16x16, + .anims = sAnims_ChasesAway_GroudonTail, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862ACA8 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_Kyogre = { - .tileTag = 30568, - .paletteTag = 30568, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862AB9C, + .tileTag = TAG_CHASE_KYOGRE, + .paletteTag = TAG_CHASE_KYOGRE, + .oam = &sOam_32x32, + .anims = sAnims_ChasesAway_Kyogre, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862ACC0 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_Rayquaza = { - .tileTag = 30569, - .paletteTag = 30569, - .oam = &sOamData_862A6BC, - .anims = sSpriteAnimTable_862ABC8, + .tileTag = TAG_CHASE_RAYQUAZA, + .paletteTag = TAG_CHASE_RAYQUAZA, + .oam = &sOam_64x64, + .anims = sAnims_ChasesAway_Rayquaza, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81D961C, + .callback = SpriteCB_ChasesAway_Rayquaza, }; -static const struct SpriteTemplate sUnknown_0862ACD8 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_RayquazaTail = { - .tileTag = 30570, - .paletteTag = 30569, - .oam = &sOamData_862A6C4, - .anims = sSpriteAnimTable_862ABF8, + .tileTag = TAG_CHASE_RAYQUAZA_TAIL, + .paletteTag = TAG_CHASE_RAYQUAZA, + .oam = &sOam_32x32, + .anims = sAnims_ChasesAway_RayquazaTail, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate sUnknown_0862ACF0 = +static const struct SpriteTemplate sSpriteTemplate_ChasesAway_KyogreSplash = { - .tileTag = 30571, - .paletteTag = 30571, - .oam = &sOamData_862A6F4, - .anims = sSpriteAnimTable_862AC24, + .tileTag = TAG_CHASE_SPLASH, + .paletteTag = TAG_CHASE_SPLASH, + .oam = &sOam_32x8, + .anims = sAnims_ChasesAway_KyogreSplash, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct BgTemplate sUnknown_0862AD08[] = +static const struct BgTemplate sBgTemplates_ChasesAway[] = { { .bg = 0, @@ -1231,13 +1284,12 @@ static const struct BgTemplate sUnknown_0862AD08[] = } }; -// code -void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void)) +void DoRayquazaScene(u8 animId, bool8 endEarly, void (*exitCallback)(void)) { sRayScene = AllocZeroed(sizeof(*sRayScene)); sRayScene->animId = animId; - sRayScene->callback = callback; - sRayScene->onlyOneAnim = onlyOneAnim; + sRayScene->exitCallback = exitCallback; + sRayScene->endEarly = endEarly; SetMainCallback2(CB2_InitRayquazaScene); } @@ -1250,7 +1302,7 @@ static void CB2_InitRayquazaScene(void) ResetPaletteFade(); ResetSpriteData(); ResetTasks(); - FillPalette(0, 0xF0, 0x20); + FillPalette(RGB_BLACK, 0xF0, 32); CreateTask(sTasksForAnimations[sRayScene->animId], 0); SetMainCallback2(CB2_RayquazaScene); } @@ -1277,7 +1329,7 @@ static void Task_EndAfterFadeScreen(u8 taskId) { ResetSpriteData(); FreeAllSpritePalettes(); - SetMainCallback2(sRayScene->callback); + SetMainCallback2(sRayScene->exitCallback); Free(sRayScene); DestroyTask(taskId); } @@ -1287,83 +1339,97 @@ static void Task_SetNextAnim(u8 taskId) { if (!gPaletteFade.active) { - if (sRayScene->onlyOneAnim == TRUE) + if (sRayScene->endEarly == TRUE) { gTasks[taskId].func = Task_EndAfterFadeScreen; } else { sRayScene->animId++; - sRayScene->field_2004 = 0; + sRayScene->unk = 0; gTasks[taskId].func = sTasksForAnimations[sRayScene->animId]; } } } -static void sub_81D68C8(void) +// The cutscene window is cropped to a narrower view, with black borders on each vertical edge +// This function is used in scenes where sprites in these borders need to be hidden +static void SetWindowsHideVertBorders(void) { - SetGpuReg(REG_OFFSET_WININ, 0x3F); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL); SetGpuReg(REG_OFFSET_WINOUT, 0); - SetGpuReg(REG_OFFSET_WIN0H, 0xF0); - SetGpuReg(REG_OFFSET_WIN0V, 0x1888); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, DISPLAY_WIDTH)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(24, DISPLAY_HEIGHT - 24)); gPlttBufferUnfaded[0] = 0; gPlttBufferFaded[0] = 0; } -static void sub_81D6904(void) +static void ResetWindowDimensions(void) { - SetGpuReg(REG_OFFSET_WININ, 0x3F); - SetGpuReg(REG_OFFSET_WINOUT, 0x3F); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_ALL); } + +// RAY_ANIM_DUO_FIGHT / RAY_ANIM_DUO_FIGHT_PRE + +#define tTimer data[0] +#define tHelperTaskId data[1] +#define tGroudonSpriteId data[2] +#define tKyogreSpriteId data[3] + +#define sGroudonBodySpriteId data[0] +#define sGroudonShoulderSpriteId data[1] +#define sGroudonClawSpriteId data[2] + static void Task_HandleDuoFightPre(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D750C(); + DuoFight_AnimateRain(); if (!gPaletteFade.active) { - s16 counter = data[0]; - if (counter == 64) + s16 frame = tTimer; + if (frame == 64) { - sub_81D7438(); + DuoFight_Lightning1(); } - else if (counter == 144) + else if (frame == 144) { - sub_81D7480(); + DuoFight_Lightning2(); } else { - switch (counter) + switch (frame) { case 328: DuoFightEnd(taskId, 0); return; case 148: - sub_81D74C8(); + DuoFight_LightningLong(); break; } } - data[0]++; + tTimer++; } } -static u8 sub_81D6984(void) +static u8 DuoFightPre_CreateGroudonSprites(void) { u8 spriteId; s16 *data; - spriteId = CreateSprite(&sUnknown_0862A72C, 88, 72, 3); - gSprites[spriteId].callback = sub_81D6A20; + spriteId = CreateSprite(&sSpriteTemplate_DuoFightPre_Groudon, 88, 72, 3); + gSprites[spriteId].callback = SpriteCB_DuoFightPre_Groudon; data = gSprites[spriteId].data; - data[0] = CreateSprite(&sUnknown_0862A72C, 56, 104, 3); - data[1] = CreateSprite(&sUnknown_0862A750, 75, 101, 0); - data[2] = CreateSprite(&sUnknown_0862A774, 109, 114, 1); - StartSpriteAnim(&gSprites[data[0]], 1); + sGroudonBodySpriteId = CreateSprite(&sSpriteTemplate_DuoFightPre_Groudon, 56, 104, 3); + sGroudonShoulderSpriteId = CreateSprite(&sSpriteTemplate_DuoFightPre_GroudonShoulder, 75, 101, 0); + sGroudonClawSpriteId = CreateSprite(&sSpriteTemplate_DuoFightPre_GroudonClaw, 109, 114, 1); + StartSpriteAnim(&gSprites[sGroudonBodySpriteId], 1); return spriteId; } -static void sub_81D6A20(struct Sprite *sprite) +static void SpriteCB_DuoFightPre_Groudon(struct Sprite *sprite) { s16 *data = sprite->data; data[5]++; @@ -1371,54 +1437,54 @@ static void sub_81D6A20(struct Sprite *sprite) if (data[5] == 0 && sprite->pos1.x != 72) { sprite->pos1.x--; - gSprites[sprite->data[0]].pos1.x--; - gSprites[data[1]].pos1.x--; - gSprites[data[2]].pos1.x--; + gSprites[sprite->sGroudonBodySpriteId].pos1.x--; + gSprites[sGroudonShoulderSpriteId].pos1.x--; + gSprites[sGroudonClawSpriteId].pos1.x--; } switch (sprite->animCmdIndex) { case 0: - gSprites[data[1]].pos2.x = 0; - gSprites[data[1]].pos2.y = 0; - gSprites[data[2]].pos2.x = 0; - gSprites[data[2]].pos2.y = 0; + gSprites[sGroudonShoulderSpriteId].pos2.x = 0; + gSprites[sGroudonShoulderSpriteId].pos2.y = 0; + gSprites[sGroudonClawSpriteId].pos2.x = 0; + gSprites[sGroudonClawSpriteId].pos2.y = 0; break; case 1: case 3: - gSprites[data[1]].pos2.x = -1; - gSprites[data[1]].pos2.y = 0; - gSprites[data[2]].pos2.x = -1; - gSprites[data[2]].pos2.y = 0; + gSprites[sGroudonShoulderSpriteId].pos2.x = -1; + gSprites[sGroudonShoulderSpriteId].pos2.y = 0; + gSprites[sGroudonClawSpriteId].pos2.x = -1; + gSprites[sGroudonClawSpriteId].pos2.y = 0; break; case 2: - gSprites[data[1]].pos2.x = -1; - gSprites[data[1]].pos2.y = 1; - gSprites[data[2]].pos2.x = -2; - gSprites[data[2]].pos2.y = 1; + gSprites[sGroudonShoulderSpriteId].pos2.x = -1; + gSprites[sGroudonShoulderSpriteId].pos2.y = 1; + gSprites[sGroudonClawSpriteId].pos2.x = -2; + gSprites[sGroudonClawSpriteId].pos2.y = 1; break; } } -static u8 sub_81D6B7C(void) +static u8 DuoFightPre_CreateKyogreSprites(void) { u8 spriteId; s16 *data; - spriteId = CreateSprite(&sUnknown_0862A81C, 136, 96, 1); - gSprites[spriteId].callback = sub_81D6D20; + spriteId = CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 136, 96, 1); + gSprites[spriteId].callback = SpriteCB_DuoFightPre_Kyogre; data = gSprites[spriteId].data; - data[0] = CreateSprite(&sUnknown_0862A81C, 168, 96, 1) << 8; - data[0] |= CreateSprite(&sUnknown_0862A81C, 136, 112, 1); - data[1] = CreateSprite(&sUnknown_0862A81C, 168, 112, 1) << 8; - data[1] |= CreateSprite(&sUnknown_0862A81C, 136, 128, 1); - data[2] = CreateSprite(&sUnknown_0862A81C, 168, 128, 1) << 8; - data[2] |= CreateSprite(&sUnknown_0862A81C, 104, 128, 2); - data[3] = CreateSprite(&sUnknown_0862A81C, 136, 128, 2) << 8; - data[3] |= CreateSprite(&sUnknown_0862A81C, 184, 128, 0); - data[4] = CreateSprite(&sUnknown_0862A84C, 208, 132, 0) << 8; - data[4] |= CreateSprite(&sUnknown_0862A864, 200, 120, 1); + data[0] = CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 168, 96, 1) << 8; + data[0] |= CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 136, 112, 1); + data[1] = CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 168, 112, 1) << 8; + data[1] |= CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 136, 128, 1); + data[2] = CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 168, 128, 1) << 8; + data[2] |= CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 104, 128, 2); + data[3] = CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 136, 128, 2) << 8; + data[3] |= CreateSprite(&sSpriteTemplate_DuoFightPre_Kyogre, 184, 128, 0); + data[4] = CreateSprite(&sSpriteTemplate_DuoFightPre_KyogrePectoralFin, 208, 132, 0) << 8; + data[4] |= CreateSprite(&sSpriteTemplate_DuoFightPre_KyogreDorsalFin, 200, 120, 1); StartSpriteAnim(&gSprites[data[0] >> 8], 1); StartSpriteAnim(&gSprites[data[0] & 0xFF], 2); @@ -1432,7 +1498,7 @@ static u8 sub_81D6B7C(void) return spriteId; } -static void sub_81D6D20(struct Sprite *sprite) +static void SpriteCB_DuoFightPre_Kyogre(struct Sprite *sprite) { s16 *data = sprite->data; data[5]++; @@ -1499,11 +1565,11 @@ static void VBlankCB_DuoFight(void) ScanlineEffect_InitHBlankDmaTransfer(); } -static void sub_81D6FE0(void) +static void InitDuoFightSceneBgs(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_0862A888, ARRAY_COUNT(sUnknown_0862A888)); + InitBgsFromTemplates(0, sBgTemplates_DuoFight, ARRAY_COUNT(sBgTemplates_DuoFight)); SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]); SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]); SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]); @@ -1518,46 +1584,46 @@ static void sub_81D6FE0(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void sub_81D706C(void) +static void LoadDuoFightSceneGfx(void) { ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(0, gRaySceneClouds_Gfx, 0, 0, 0); - while (FreeTempTileDataBuffersIfPossible()); - - LZDecompressWram(gRaySceneClouds2_Tilemap, sRayScene->tilemapBuffers[0]); - LZDecompressWram(gRaySceneClouds1_Tilemap, sRayScene->tilemapBuffers[1]); - LZDecompressWram(gRaySceneClouds3_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneClouds_Pal, 0, 0x40); - LoadCompressedSpriteSheet(&sUnknown_0862A8C4); - LoadCompressedSpriteSheet(&sUnknown_0862A8F8); - LoadCompressedSpriteSheet(&sUnknown_0862A924); - LoadCompressedSpriteSheet(&sUnknown_0862A9D4); - LoadCompressedSpriteSheet(&sUnknown_0862AA14); - LoadCompressedSpriteSheet(&sUnknown_0862AA34); - LoadCompressedSpritePalette(&sUnknown_0862A8CC); - LoadCompressedSpritePalette(&sUnknown_0862A9DC); + DecompressAndCopyTileDataToVram(0, gRaySceneDuoFight_Clouds_Gfx, 0, 0, 0); + while (FreeTempTileDataBuffersIfPossible()) + ; + LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); + LZDecompressWram(gRaySceneDuoFight_Clouds1_Tilemap, sRayScene->tilemapBuffers[1]); + LZDecompressWram(gRaySceneDuoFight_Clouds3_Tilemap, sRayScene->tilemapBuffers[2]); + LoadCompressedPalette(gRaySceneDuoFight_Clouds_Pal, 0, 0x40); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_Groudon); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonShoulder); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_GroudonClaw); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_Kyogre); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_KyogrePectoralFin); + LoadCompressedSpriteSheet(&sSpriteSheet_DuoFight_KyogreDorsalFin); + LoadCompressedSpritePalette(&sSpritePal_DuoFight_Groudon); + LoadCompressedSpritePalette(&sSpritePal_DuoFight_Kyogre); } static void Task_DuoFightAnim(u8 taskId) { s16 *data = gTasks[taskId].data; ScanlineEffect_Clear(); - sub_81D6FE0(); - sub_81D706C(); + InitDuoFightSceneBgs(); + LoadDuoFightSceneGfx(); CpuFastFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers)); - ScanlineEffect_SetParams(sUnknown_0862A87C); - data[0] = 0; - data[1] = CreateTask(sub_81D7228, 0); + ScanlineEffect_SetParams(sScanlineParams_DuoFight_Clouds); + tTimer = 0; + tHelperTaskId = CreateTask(Task_DuoFight_AnimateClouds, 0); if (sRayScene->animId == RAY_ANIM_DUO_FIGHT_PRE) { - data[2] = sub_81D6984(); - data[3] = sub_81D6B7C(); + tGroudonSpriteId = DuoFightPre_CreateGroudonSprites(); + tKyogreSpriteId = DuoFightPre_CreateKyogreSprites(); gTasks[taskId].func = Task_HandleDuoFightPre; } else { - data[2] = sub_81D7664(); - data[3] = sub_81D78BC(); + tGroudonSpriteId = DuoFight_CreateGroudonSprites(); + tKyogreSpriteId = DuoFight_CreateKyogreSprites(); gTasks[taskId].func = Task_HandleDuoFight; StopMapMusic(); } @@ -1565,10 +1631,10 @@ static void Task_DuoFightAnim(u8 taskId) BlendPalettes(-1, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_DuoFight); - PlaySE(SE_T_OOAME); + PlaySE(SE_DOWNPOUR); } -static void sub_81D7228(u8 taskId) +static void Task_DuoFight_AnimateClouds(u8 taskId) { s16 i; u16 *data = gTasks[taskId].data; @@ -1630,91 +1696,95 @@ static void sub_81D7228(u8 taskId) static void Task_HandleDuoFight(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D750C(); + DuoFight_AnimateRain(); if (!gPaletteFade.active) { - s16 counter = data[0]; - if (counter == 32 || counter == 112) + s16 frame = tTimer; + if (frame == 32 || frame == 112) { - sub_81D7438(); + DuoFight_Lightning1(); } - else if (counter == 216) + else if (frame == 216) { - sub_81D7480(); + DuoFight_Lightning2(); } - else if (counter == 220) + else if (frame == 220) { - sub_81D74C8(); + DuoFight_LightningLong(); } else { - switch (counter) + switch (frame) { case 412: DuoFightEnd(taskId, 2); return; case 380: SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND); - gTasks[data[1]].func = sub_81D752C; - gTasks[data[1]].data[0] = 0; - gTasks[data[1]].data[2] = data[2]; - gTasks[data[1]].data[3] = data[3]; + gTasks[tHelperTaskId].func = DuoFight_PanOffScene; + gTasks[tHelperTaskId].data[0] = 0; + gTasks[tHelperTaskId].data[2] = data[2]; + gTasks[tHelperTaskId].data[3] = data[3]; ScanlineEffect_Stop(); break; } } - data[0]++; + tTimer++; } } -static void sub_81D7438(void) +// In the below functions, BlendPalettesGradually flashes the bg white and the duo black +// and gradually fades them back to original color to simulate lightning +static void DuoFight_Lightning1(void) { - PlaySE(SE_T_KAMI); - sub_80A2C44(0x7FFF, 0, 0x10, 0, -1, 0, 0); - sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1); + PlaySE(SE_THUNDER); + BlendPalettesGradually(0x00007FFF, 0, 16, 0, RGB_WHITEALPHA, 0, 0); + BlendPalettesGradually(0xFFFF0000, 0, 16, 0, RGB_BLACK, 0, 1); } -static void sub_81D7480(void) +static void DuoFight_Lightning2(void) { - PlaySE(SE_T_KAMI); - sub_80A2C44(0x7FFF, 0, 0x10, 0x10, -1, 0, 0); - sub_80A2C44(0xFFFF0000, 0, 0x10, 0x10, 0, 0, 1); + PlaySE(SE_THUNDER); + BlendPalettesGradually(0x00007FFF, 0, 16, 16, RGB_WHITEALPHA, 0, 0); + BlendPalettesGradually(0xFFFF0000, 0, 16, 16, RGB_BLACK, 0, 1); } -static void sub_81D74C8(void) +static void DuoFight_LightningLong(void) { - sub_80A2C44(0x7FFF, 4, 0x10, 0, -1, 0, 0); - sub_80A2C44(0xFFFF0000, 4, 0x10, 0, 0, 0, 1); + BlendPalettesGradually(0x00007FFF, 4, 16, 0, RGB_WHITEALPHA, 0, 0); + BlendPalettesGradually(0xFFFF0000, 4, 16, 0, RGB_BLACK, 0, 1); } -static void sub_81D750C(void) +static void DuoFight_AnimateRain(void) { ChangeBgX(2, 0x400, 1); ChangeBgY(2, 0x800, 2); } -static void sub_81D752C(u8 taskId) +// Only used by the full version, which pans up at the end (so scene objects move down) +// DuoFightPre just fades to black with no pan +static void DuoFight_PanOffScene(u8 taskId) { u16 bgY; s16 *data = gTasks[taskId].data; - sub_81D7860(&gSprites[data[2]]); - sub_81D7D14(&gSprites[data[3]]); + DuoFight_SlideGroudonDown(&gSprites[tGroudonSpriteId]); + DuoFight_SlideKyogreDown(&gSprites[tKyogreSpriteId]); bgY = GetBgY(1); if (GetBgY(1) == 0 || bgY > 0x8000) ChangeBgY(1, 0x400, 2); - if (data[0] != 16) + if (tTimer != 16) { - data[0]++; - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - data[0], data[0])); + tTimer++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - tTimer, tTimer)); } } static void DuoFightEnd(u8 taskId, s8 palDelay) { - PlaySE(SE_T_OOAME_E); + PlaySE(SE_DOWNPOUR_STOP); BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_DuoFightEnd; } @@ -1722,36 +1792,36 @@ static void DuoFightEnd(u8 taskId, s8 palDelay) static void Task_DuoFightEnd(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D750C(); + DuoFight_AnimateRain(); if (!gPaletteFade.active) { - DestroyTask(data[1]); + DestroyTask(tHelperTaskId); ChangeBgY(1, 0, 0); SetVBlankCallback(NULL); ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); - data[0] = 0; + tTimer = 0; gTasks[taskId].func = Task_SetNextAnim; } } -static u8 sub_81D7664(void) +static u8 DuoFight_CreateGroudonSprites(void) { u8 spriteId; s16 *data; - spriteId = CreateSprite(&sUnknown_0862A8D4, 98, 72, 3); - gSprites[spriteId].callback = sub_81D7700; + spriteId = CreateSprite(&sSpriteTemplate_DuoFight_Groudon, 98, 72, 3); + gSprites[spriteId].callback = SpriteCB_DuoFight_Groudon; data = gSprites[spriteId].data; - data[0] = CreateSprite(&sUnknown_0862A8D4, 66, 104, 3); - data[1] = CreateSprite(&sUnknown_0862A900, 85, 101, 0); - data[2] = CreateSprite(&sUnknown_0862A92C, 119, 114, 1); - StartSpriteAnim(&gSprites[data[0]], 1); + sGroudonBodySpriteId = CreateSprite(&sSpriteTemplate_DuoFight_Groudon, 66, 104, 3); + sGroudonShoulderSpriteId = CreateSprite(&sSpriteTemplate_DuoFight_GroudonShoulder, 85, 101, 0); + sGroudonClawSpriteId = CreateSprite(&sSpriteTemplate_DuoFight_GroudonClaw, 119, 114, 1); + StartSpriteAnim(&gSprites[sGroudonBodySpriteId], 1); return spriteId; } -static void sub_81D7700(struct Sprite *sprite) +static void SpriteCB_DuoFight_Groudon(struct Sprite *sprite) { s16 *data = sprite->data; data[5]++; @@ -1759,66 +1829,66 @@ static void sub_81D7700(struct Sprite *sprite) if (!(data[5] & 7) && sprite->pos1.x != 72) { sprite->pos1.x--; - gSprites[sprite->data[0]].pos1.x--; - gSprites[data[1]].pos1.x--; - gSprites[data[2]].pos1.x--; + gSprites[sprite->sGroudonBodySpriteId].pos1.x--; + gSprites[sGroudonShoulderSpriteId].pos1.x--; + gSprites[sGroudonClawSpriteId].pos1.x--; } switch (sprite->animCmdIndex) { case 0: - gSprites[data[1]].pos2.x = 0; - gSprites[data[1]].pos2.y = 0; - gSprites[data[2]].pos2.x = 0; - gSprites[data[2]].pos2.y = 0; + gSprites[sGroudonShoulderSpriteId].pos2.x = 0; + gSprites[sGroudonShoulderSpriteId].pos2.y = 0; + gSprites[sGroudonClawSpriteId].pos2.x = 0; + gSprites[sGroudonClawSpriteId].pos2.y = 0; break; case 1: case 3: - gSprites[data[1]].pos2.x = -1; - gSprites[data[1]].pos2.y = 0; - gSprites[data[2]].pos2.x = -1; - gSprites[data[2]].pos2.y = 0; + gSprites[sGroudonShoulderSpriteId].pos2.x = -1; + gSprites[sGroudonShoulderSpriteId].pos2.y = 0; + gSprites[sGroudonClawSpriteId].pos2.x = -1; + gSprites[sGroudonClawSpriteId].pos2.y = 0; break; case 2: - gSprites[data[1]].pos2.x = -1; - gSprites[data[1]].pos2.y = 1; - gSprites[data[2]].pos2.x = -2; - gSprites[data[2]].pos2.y = 1; + gSprites[sGroudonShoulderSpriteId].pos2.x = -1; + gSprites[sGroudonShoulderSpriteId].pos2.y = 1; + gSprites[sGroudonClawSpriteId].pos2.x = -2; + gSprites[sGroudonClawSpriteId].pos2.y = 1; break; } } -static void sub_81D7860(struct Sprite *sprite) +static void DuoFight_SlideGroudonDown(struct Sprite *sprite) { s16 *data = sprite->data; if (sprite->pos1.y <= 160) { sprite->pos1.y += 8; - gSprites[sprite->data[0]].pos1.y += 8; - gSprites[data[1]].pos1.y += 8; - gSprites[data[2]].pos1.y += 8; + gSprites[sprite->sGroudonBodySpriteId].pos1.y += 8; + gSprites[sGroudonShoulderSpriteId].pos1.y += 8; + gSprites[sGroudonClawSpriteId].pos1.y += 8; } } -static u8 sub_81D78BC(void) +static u8 DuoFight_CreateKyogreSprites(void) { u8 spriteId; s16 *data; - spriteId = CreateSprite(&sUnknown_0862A9E4, 126, 96, 1); - gSprites[spriteId].callback = sub_81D7A60; + spriteId = CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 126, 96, 1); + gSprites[spriteId].callback = SpriteCB_DuoFight_Kyogre; data = gSprites[spriteId].data; - data[0] = CreateSprite(&sUnknown_0862A9E4, 158, 96, 1) << 8; - data[0] |= CreateSprite(&sUnknown_0862A9E4, 126, 112, 1); - data[1] = CreateSprite(&sUnknown_0862A9E4, 158, 112, 1) << 8; - data[1] |= CreateSprite(&sUnknown_0862A9E4, 126, 128, 1); - data[2] = CreateSprite(&sUnknown_0862A9E4, 158, 128, 1) << 8; - data[2] |= CreateSprite(&sUnknown_0862A9E4, 94, 128, 2); - data[3] = CreateSprite(&sUnknown_0862A9E4, 126, 128, 2) << 8; - data[3] |= CreateSprite(&sUnknown_0862A9E4, 174, 128, 0); - data[4] = CreateSprite(&sUnknown_0862AA1C, 198, 132, 0) << 8; - data[4] |= CreateSprite(&sUnknown_0862AA3C, 190, 120, 1); + data[0] = CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 158, 96, 1) << 8; + data[0] |= CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 126, 112, 1); + data[1] = CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 158, 112, 1) << 8; + data[1] |= CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 126, 128, 1); + data[2] = CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 158, 128, 1) << 8; + data[2] |= CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 94, 128, 2); + data[3] = CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 126, 128, 2) << 8; + data[3] |= CreateSprite(&sSpriteTemplate_DuoFight_Kyogre, 174, 128, 0); + data[4] = CreateSprite(&sSpriteTemplate_DuoFight_KyogrePectoralFin, 198, 132, 0) << 8; + data[4] |= CreateSprite(&sSpriteTemplate_DuoFight_KyogreDorsalFin, 190, 120, 1); StartSpriteAnim(&gSprites[data[0] >> 8], 1); StartSpriteAnim(&gSprites[data[0] & 0xFF], 2); @@ -1832,7 +1902,7 @@ static u8 sub_81D78BC(void) return spriteId; } -static void sub_81D7A60(struct Sprite *sprite) +static void SpriteCB_DuoFight_Kyogre(struct Sprite *sprite) { s16 *data = sprite->data; data[5]++; @@ -1893,7 +1963,7 @@ static void sub_81D7A60(struct Sprite *sprite) } } -static void sub_81D7D14(struct Sprite *sprite) +static void DuoFight_SlideKyogreDown(struct Sprite *sprite) { s16 *data = sprite->data; if (sprite->pos1.y <= 160) @@ -1912,11 +1982,32 @@ static void sub_81D7D14(struct Sprite *sprite) } } -static void sub_81D7E10(void) +#undef tTimer +#undef tHelperTaskId +#undef tGroudonSpriteId +#undef tKyogreSpriteId + +#undef sGroudonBodySpriteId +#undef sGroudonShoulderSpriteId +#undef sGroudonClawSpriteId + + +// RAY_ANIM_TAKES_FLIGHT + +#define tState data[0] +#define tTimer data[1] +#define tScale data[2] +#define tScaleSpeed data[3] +#define tYCoord data[4] +#define tYSpeed data[5] +#define tYOffset data[6] +#define tYOffsetDir data[7] + +static void InitTakesFlightSceneBgs(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(1, sUnknown_0862AA54, ARRAY_COUNT(sUnknown_0862AA54)); + InitBgsFromTemplates(1, sBgTemplates_TakesFlight, ARRAY_COUNT(sBgTemplates_TakesFlight)); SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]); SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]); SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]); @@ -1931,99 +2022,117 @@ static void sub_81D7E10(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void sub_81D7E9C(void) +static void LoadTakesFlightSceneGfx(void) { ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(0, gRaySceneClouds_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, gRaySceneOvercast_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(2, gRaySceneRayquaza_Gfx, 0, 0, 0); - while (FreeTempTileDataBuffersIfPossible()); - - LZDecompressWram(gRaySceneClouds2_Tilemap, sRayScene->tilemapBuffers[0]); - LZDecompressWram(gRaySceneOvercast_Tilemap, sRayScene->tilemapBuffers[1]); - LZDecompressWram(gRaySceneRayquaza_Tilemap, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneRayquaza_Pal, 0, 0x40); - LoadCompressedSpriteSheet(&sUnknown_0862AA90); - LoadCompressedSpritePalette(&sUnknown_0862AA98); + DecompressAndCopyTileDataToVram(0, gRaySceneDuoFight_Clouds_Gfx, 0, 0, 0); // Re-uses clouds from previous scene + DecompressAndCopyTileDataToVram(1, gRaySceneTakesFlight_Bg_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gRaySceneTakesFlight_Rayquaza_Gfx, 0, 0, 0); + while (FreeTempTileDataBuffersIfPossible()) + ; + LZDecompressWram(gRaySceneDuoFight_Clouds2_Tilemap, sRayScene->tilemapBuffers[0]); + LZDecompressWram(gRaySceneTakesFlight_Bg_Tilemap, sRayScene->tilemapBuffers[1]); + LZDecompressWram(gRaySceneTakesFlight_Rayquaza_Tilemap, sRayScene->tilemapBuffers[2]); + LoadCompressedPalette(gRaySceneTakesFlight_Rayquaza_Pal, 0, 64); + LoadCompressedSpriteSheet(&sSpriteSheet_TakesFlight_Smoke); + LoadCompressedSpritePalette(&sSpritePal_TakesFlight_Smoke); } static void Task_RayTakesFlightAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - PlayNewMapMusic(MUS_REKKUU_KOURIN); - sub_81D7E10(); - sub_81D7E9C(); + PlayNewMapMusic(MUS_RAYQUAZA_APPEARS); + InitTakesFlightSceneBgs(); + LoadTakesFlightSceneGfx(); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_OBJ | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); - BlendPalettes(-1, 0x10, 0); + BlendPalettes(-1, 16, 0); SetVBlankCallback(VBlankCB_RayquazaScene); - CreateTask(sub_81D81A4, 0); - data[0] = 0; - data[1] = 0; + CreateTask(Task_TakesFlight_CreateSmoke, 0); + tState = 0; + tTimer = 0; gTasks[taskId].func = Task_HandleRayTakesFlight; } +// Animate Rayquaza (flying up and down, and changing size as it gets further from the screen) +// In this scene Rayquaza is a bg tilemap on bg 2, not a sprite static void Task_HandleRayTakesFlight(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - if (data[1] == 8) + // Delay, then fade in + if (tTimer == 8) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - data[2] = 0; - data[3] = 30; - data[4] = 0; - data[5] = 7; - data[1] = 0; - data[0]++; + tScale = 0; + tScaleSpeed = 30; + tYCoord = 0; + tYSpeed = 7; + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } break; case 1: - data[2] += data[3]; - data[4] += data[5]; - if (data[3] > 3) - data[3] -= 3; - if (data[5] != 0) - data[5]--; - if (data[2] > 255) + // Fly in + tScale += tScaleSpeed; + tYCoord += tYSpeed; + + if (tScaleSpeed > 3) + tScaleSpeed -= 3; + + if (tYSpeed != 0) + tYSpeed--; + + if (tScale > 255) { - data[2] = 256; - data[3] = 0; - data[6] = 12; - data[7] = -1; - data[1] = 0; - data[0]++; + tScale = 256; + tScaleSpeed = 0; + tYOffset = 12; + tYOffsetDir = -1; + tTimer = 0; + tState++; } - SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32, data[2], data[2], 0); + SetBgAffine(2, 0x7800, 0x1800, 120, tYCoord + 32, tScale, tScale, 0); break; case 2: - data[1]++; - SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32 + (data[6] >> 2), data[2], data[2], 0); - data[6] += data[7]; - if (data[6] == 12 || data[6] == -12) + // Float up and down + tTimer++; + SetBgAffine(2, 0x7800, 0x1800, 120, tYCoord + 32 + (tYOffset >> 2), tScale, tScale, 0); + tYOffset += tYOffsetDir; + if (tYOffset == 12 || tYOffset == -12) { - data[7] *= -1; - if (data[1] > 295) + tYOffsetDir *= -1; + if (tTimer > 295) { - data[0]++; + tState++; BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 0x10, RGB_BLACK); } } break; case 3: - data[2] += 16; - SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32, data[2], data[2], 0); + // Fly away, fade out + tScale += 16; + SetBgAffine(2, 0x7800, 0x1800, 120, tYCoord + 32, tScale, tScale, 0); Task_RayTakesFlightEnd(taskId); break; } } +#undef tState +#undef tTimer +#undef tScale +#undef tScaleSpeed +#undef tYCoord +#undef tYSpeed +#undef tYOffset +#undef tYOffsetDir + static void Task_RayTakesFlightEnd(u8 taskId) { if (!gPaletteFade.active) @@ -2035,56 +2144,71 @@ static void Task_RayTakesFlightEnd(u8 taskId) } } -static void sub_81D81A4(u8 taskId) +#define tSmokeId data[0] +#define tTimer data[1] + +#define sSmokeId data[0] +#define sTimer data[1] + +static void Task_TakesFlight_CreateSmoke(u8 taskId) { s16 *data = gTasks[taskId].data; - if ((data[1] & 3) == 0) + if ((tTimer & 3) == 0) { - u8 spriteId = CreateSprite(&sUnknown_0862AAA0, - (sUnknown_0862AAB8[data[0]][0] * 4) + 120, - (sUnknown_0862AAB8[data[0]][1] * 4) + 80, + u8 spriteId = CreateSprite(&sSpriteTemplate_TakesFlight_Smoke, + (sTakesFlight_SmokeCoords[tSmokeId][0] * 4) + 120, + (sTakesFlight_SmokeCoords[tSmokeId][1] * 4) + 80, 0); - gSprites[spriteId].data[0] = (s8)(data[0]); + gSprites[spriteId].sSmokeId = (s8)(tSmokeId); gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE; gSprites[spriteId].oam.priority = 2; InitSpriteAffineAnim(&gSprites[spriteId]); - if (data[0] == 9) + if (tSmokeId == MAX_SMOKE - 1) { DestroyTask(taskId); return; } else { - data[0]++; + tSmokeId++; } } - data[1]++; + tTimer++; } -static void sub_81D8260(struct Sprite *sprite) +#undef tSmokeId +#undef tTimer + +static void SpriteCB_TakesFlight_Smoke(struct Sprite *sprite) { - if (sprite->data[1] == 0) + if (sprite->sTimer == 0) { sprite->pos2.x = 0; sprite->pos2.y = 0; } else { - sprite->pos2.x += sUnknown_0862AAB8[sprite->data[0]][0]; - sprite->pos2.y += sUnknown_0862AAB8[sprite->data[0]][1]; + sprite->pos2.x += sTakesFlight_SmokeCoords[sprite->sSmokeId][0]; + sprite->pos2.y += sTakesFlight_SmokeCoords[sprite->sSmokeId][1]; } - sprite->data[1]++; - sprite->data[1] &= 0xF; + sprite->sTimer++; + sprite->sTimer &= 0xF; } -static void sub_81D82B0(void) +#undef sSmokeId +#undef sTimer + + +// RAY_ANIM_DESCENDS + +static void InitDescendsSceneBgs(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_0862AACC, ARRAY_COUNT(sUnknown_0862AACC)); + InitBgsFromTemplates(0, sBgTemplates_Descends, ARRAY_COUNT(sBgTemplates_Descends)); SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]); SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]); SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]); @@ -2102,65 +2226,72 @@ static void sub_81D82B0(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void sub_81D8358(void) +static void LoadDescendsSceneGfx(void) { ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(0, gRaySceneRayquazaLight_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, gRaySceneOvercast2_Gfx, 0, 0, 0); - while (FreeTempTileDataBuffersIfPossible()); - - LZDecompressWram(gRaySceneRayquazaLight_Tilemap, sRayScene->tilemapBuffers[0]); - LZDecompressWram(gRaySceneOvercast2_Tilemap, sRayScene->tilemapBuffers[3]); - CpuFastFill16(0, sRayScene->tilemapBuffers[2], 0x800); - CpuFastCopy(sRayScene->tilemapBuffers[3], sRayScene->tilemapBuffers[1], 0x800); + DecompressAndCopyTileDataToVram(0, gRaySceneDescends_Light_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gRaySceneDescends_Bg_Gfx, 0, 0, 0); + while (FreeTempTileDataBuffersIfPossible()) + ; + LZDecompressWram(gRaySceneDescends_Light_Tilemap, sRayScene->tilemapBuffers[0]); + LZDecompressWram(gRaySceneDescends_Bg_Tilemap, sRayScene->tilemapBuffers[3]); + CpuFastFill16(0, sRayScene->tilemapBuffers[2], BG_SCREEN_SIZE); + CpuFastCopy(sRayScene->tilemapBuffers[3], sRayScene->tilemapBuffers[1], BG_SCREEN_SIZE); CpuFastFill16(0, &sRayScene->tilemapBuffers[1][0x100], 0x340); - LoadCompressedPalette(gRaySceneOvercast2_Pal, 0, 0x40); + LoadCompressedPalette(gRaySceneDescends_Bg_Pal, 0, 0x40); gPlttBufferUnfaded[0] = RGB_WHITE; gPlttBufferFaded[0] = RGB_WHITE; - LoadCompressedSpriteSheet(&sUnknown_0862AAFC); - LoadCompressedSpriteSheet(&sUnknown_0862AB04); - LoadCompressedSpritePalette(&sUnknown_0862AB0C); + LoadCompressedSpriteSheet(&sSpriteSheet_Descends_Rayquaza); + LoadCompressedSpriteSheet(&sSpriteSheet_Descends_RayquazaTail); + LoadCompressedSpritePalette(&sSpritePal_Descends_Rayquaza); } -static void sub_81D844C(void) +// Draw ray of light emerging from the clouds +static void HBlankCB_RayDescends(void) { - u16 VCOUNT = GetGpuReg(REG_OFFSET_VCOUNT); - if (VCOUNT >= 24 && VCOUNT <= 135 && VCOUNT - 24 <= sRayScene->field_2008) - REG_BLDALPHA = 0xD08; + u16 vcount = GetGpuReg(REG_OFFSET_VCOUNT); + if (vcount >= 24 && vcount <= 135 && vcount - 24 <= sRayScene->revealedLightLine) + REG_BLDALPHA = 0xD08; // This line is above where light has been revealed, draw it else - REG_BLDALPHA = 0x1000; + REG_BLDALPHA = 0x1000; // Below where light has been revealed, hide it - if (VCOUNT == 0) + if (vcount == 0) { - if (sRayScene->field_2008 <= 0x1FFF) + if (sRayScene->revealedLightLine <= 0x1FFF) { - if (sRayScene->field_2008 <= 39) - sRayScene->field_2008 += 4; - else if (sRayScene->field_2008 <= 79) - sRayScene->field_2008 += 2; + // Increase the number of pixel rows of the light that have been revealed + // Gradually slows as it reaches the bottom + if (sRayScene->revealedLightLine <= 39) + sRayScene->revealedLightLine += 4; + else if (sRayScene->revealedLightLine <= 79) + sRayScene->revealedLightLine += 2; else - sRayScene->field_2008 += 1; + sRayScene->revealedLightLine += 1; } - sRayScene->field_200A++; + // Pointless + sRayScene->revealedLightTimer++; } } +#define tState data[0] +#define tTimer data[1] + static void Task_RayDescendsAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D82B0(); - sub_81D8358(); + InitDescendsSceneBgs(); + LoadDescendsSceneGfx(); SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); BlendPalettes(-1, 0x10, 0); SetVBlankCallback(VBlankCB_RayquazaScene); - sRayScene->field_2008 = 0; - sRayScene->field_200A = 0; - data[0] = 0; - data[1] = 0; - data[2] = 0; + sRayScene->revealedLightLine = 0; + sRayScene->revealedLightTimer = 0; + tState = 0; + tTimer = 0; + data[2] = 0; // Below data assignments do nothing data[3] = 0; data[4] = 0x1000; gTasks[taskId].func = Task_HandleRayDescends; @@ -2169,56 +2300,61 @@ static void Task_RayDescendsAnim(u8 taskId) static void Task_HandleRayDescends(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - if (data[1] == 8) + // Delay, then fade in + if (tTimer == 8) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } break; case 1: if (!gPaletteFade.active) { - if (data[1] == 10) + // Delay, then start ray of light + if (tTimer == 10) { - data[1] = 0; - data[0]++; - SetHBlankCallback(sub_81D844C); + tTimer = 0; + tState++; + SetHBlankCallback(HBlankCB_RayDescends); EnableInterrupts(INTR_FLAG_HBLANK | INTR_FLAG_VBLANK); } else { - data[1]++; + tTimer++; } } break; case 2: - if (data[1] == 80) + // Delay, then start Rayquaza emerging from clouds + if (tTimer == 80) { - data[1] = 0; - data[0]++; - sub_81D86CC(); + tTimer = 0; + tState++; + CreateDescendsRayquazaSprite(); } else { - data[1]++; + tTimer++; } break; case 3: - if (++data[1] == 368) + // Wait while Rayquaza descends + if (++tTimer == 368) { - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } break; case 4: + // Fade out BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_RayDescendsEnd; break; @@ -2237,76 +2373,92 @@ static void Task_RayDescendsEnd(u8 taskId) } } -static u8 sub_81D86CC(void) +#define sTailSpriteId data[0] +#define sTimer data[2] +#define sXMovePeriod data[3] +#define sYMovePeriod data[4] + +static u8 CreateDescendsRayquazaSprite(void) { - u8 spriteId = CreateSprite(&sUnknown_0862AB14, 160, 0, 0); + u8 spriteId = CreateSprite(&sSpriteTemplate_Descends_Rayquaza, 160, 0, 0); s16 *data = gSprites[spriteId].data; - data[0] = CreateSprite(&sUnknown_0862AB2C, 184, -48, 0); - gSprites[spriteId].callback = sub_81D874C; + sTailSpriteId = CreateSprite(&sSpriteTemplate_Descends_RayquazaTail, 184, -48, 0); + gSprites[spriteId].callback = SpriteCB_Descends_Rayquaza; gSprites[spriteId].oam.priority = 3; - gSprites[data[0]].oam.priority = 3; + gSprites[sTailSpriteId].oam.priority = 3; return spriteId; } -static void sub_81D874C(struct Sprite *sprite) +static void SpriteCB_Descends_Rayquaza(struct Sprite *sprite) { s16 *data = sprite->data; - s16 counter = data[2]; - if (counter == 0) + s16 frame = sTimer; + + // Updates to Rayquaza's coords occur more frequently + // as time goes on (it accelerates as it emerges) + if (frame == 0) { - data[3] = 12; - data[4] = 8; + sXMovePeriod = 12; + sYMovePeriod = 8; } - else if (counter == 256) + else if (frame == 256) { - data[3] = 9; - data[4] = 7; + sXMovePeriod = 9; + sYMovePeriod = 7; } - else if (counter == 268) + else if (frame == 268) { - data[3] = 8; - data[4] = 6; + sXMovePeriod = 8; + sYMovePeriod = 6; } - else if (counter == 280) + else if (frame == 280) { - data[3] = 7; - data[4] = 5; + sXMovePeriod = 7; + sYMovePeriod = 5; } - else if (counter == 292) + else if (frame == 292) { - data[3] = 6; - data[4] = 4; + sXMovePeriod = 6; + sYMovePeriod = 4; } - else if (counter == 304) + else if (frame == 304) { - data[3] = 5; - data[4] = 3; + sXMovePeriod = 5; + sYMovePeriod = 3; } - else if (counter == 320) + else if (frame == 320) { - data[3] = 4; - data[4] = 2; + sXMovePeriod = 4; + sYMovePeriod = 2; } - if (data[2] % data[3] == 0) + if (sTimer % sXMovePeriod == 0) { sprite->pos2.x--; - gSprites[data[0]].pos2.x--; + gSprites[sTailSpriteId].pos2.x--; } - if (data[2] % data[4] == 0) + if (sTimer % sYMovePeriod == 0) { sprite->pos2.y++; - gSprites[data[0]].pos2.y++; + gSprites[sTailSpriteId].pos2.y++; } - data[2]++; + sTimer++; } -static void sub_81D8828(void) +#undef sTailSpriteId +#undef sTimer +#undef sXMovePeriod +#undef sYMovePeriod + + +// RAY_ANIM_CHARGES + +static void InitChargesSceneBgs(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_0862AB44, ARRAY_COUNT(sUnknown_0862AB44)); + InitBgsFromTemplates(0, sBgTemplates_Charges, ARRAY_COUNT(sBgTemplates_Charges)); SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]); SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]); SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]); @@ -2324,124 +2476,151 @@ static void sub_81D8828(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void sub_81D88D0(void) +static void LoadChargesSceneGfx(void) { ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(1, gRaySceneRayquazaChase_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(2, gRaySceneChaseStreaks_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(3, gRaySceneChaseBg_Gfx, 0, 0, 0); - while (FreeTempTileDataBuffersIfPossible()); - - LZDecompressWram(gRayChaseRayquazaChase2_Tilemap, sRayScene->tilemapBuffers[0]); - LZDecompressWram(gRayChaseRayquazaChase_Tilemap, sRayScene->tilemapBuffers[1]); - LZDecompressWram(gRaySceneChaseStreaks_Tilemap, sRayScene->tilemapBuffers[2]); - LZDecompressWram(gRaySceneChaseBg_Tilemap, sRayScene->tilemapBuffers[3]); - LoadCompressedPalette(gRaySceneChase_Pal, 0, 0x80); + DecompressAndCopyTileDataToVram(1, gRaySceneCharges_Rayquaza_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gRaySceneCharges_Streaks_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, gRaySceneCharges_Bg_Gfx, 0, 0, 0); + while (FreeTempTileDataBuffersIfPossible()) + ; + LZDecompressWram(gRaySceneCharges_Orbs_Tilemap, sRayScene->tilemapBuffers[0]); + LZDecompressWram(gRaySceneCharges_Rayquaza_Tilemap, sRayScene->tilemapBuffers[1]); + LZDecompressWram(gRaySceneCharges_Streaks_Tilemap, sRayScene->tilemapBuffers[2]); + LZDecompressWram(gRaySceneCharges_Bg_Tilemap, sRayScene->tilemapBuffers[3]); + LoadCompressedPalette(gRaySceneCharges_Bg_Pal, 0, 0x80); } +#define tState data[0] +#define tTimer data[1] +#define tRayquazaTaskId data[2] +#define tSoundTimer data[3] + static void Task_RayChargesAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D8828(); - sub_81D88D0(); - sub_81D68C8(); + InitChargesSceneBgs(); + LoadChargesSceneGfx(); + SetWindowsHideVertBorders(); BlendPalettes(-1, 0x10, 0); SetVBlankCallback(VBlankCB_RayquazaScene); - data[0] = 0; - data[1] = 0; - data[2] = CreateTask(sub_81D8AD8, 0); + tState = 0; + tTimer = 0; + tRayquazaTaskId = CreateTask(Task_RayCharges_ShakeRayquaza, 0); gTasks[taskId].func = Task_HandleRayCharges; } static void Task_HandleRayCharges(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D8BB4(); - if ((data[3] & 7) == 0 && data[0] <= 1 && data[1] <= 89) - PlaySE(SE_OP_BASYU); + RayCharges_AnimateBg(); + if ((tSoundTimer & 7) == 0 && tState <= 1 && tTimer <= 89) + PlaySE(SE_INTRO_BLAST); - data[3]++; - switch (data[0]) + tSoundTimer++; + switch (tState) { case 0: - if (data[1] == 8) + // Delay, then fade in + if (tTimer == 8) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } break; case 1: - if (data[1] == 127) + // Delay while Rayquaza shakes, then start Rayquaza moving offscreen + if (tTimer == 127) { - data[1] = 0; - data[0]++; - gTasks[data[2]].func = sub_81D8B2C; + tTimer = 0; + tState++; + gTasks[tRayquazaTaskId].func = Task_RayCharges_FlyOffscreen; } else { - data[1]++; + tTimer++; } break; case 2: - if (data[1] == 12) + // Delay for Rayquaza's flying animation + if (tTimer == 12) { - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } break; case 3: + // Fade out BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_RayChargesEnd; break; } } -static void sub_81D8AD8(u8 taskId) +#undef tState +#undef tTimer +#undef tSoundTimer + +#define tState data[0] +#define tOffset data[1] +#define tShakeDir data[2] +#define tTimer data[15] + +static void Task_RayCharges_ShakeRayquaza(u8 taskId) { s16 *data = gTasks[taskId].data; - if ((data[15] & 3) == 0) + if ((tTimer & 3) == 0) { ChangeBgX(1, (Random() % 8 - 4) << 8, 0); ChangeBgY(1, (Random() % 8 - 4) << 8, 0); } - data[15]++; + tTimer++; } -static void sub_81D8B2C(u8 taskId) +// Rayquaza backs up then launches forward +static void Task_RayCharges_FlyOffscreen(u8 taskId) { s16 *data = gTasks[taskId].data; - if (data[0] == 0) + if (tState == 0) { ChangeBgX(1, 0, 0); ChangeBgY(1, 0, 0); - data[0]++; - data[1] = 10; - data[2] = -1; + tState++; + tOffset = 10; + tShakeDir = -1; } - else if (data[0] == 1) + else if (tState == 1) { - ChangeBgX(1, data[1] << 8, 2); - ChangeBgY(1, data[1] << 8, 1); - data[1] += data[2]; - if (data[1] == -10) - data[2] *= -1; + ChangeBgX(1, tOffset << 8, 2); + ChangeBgY(1, tOffset << 8, 1); + tOffset += tShakeDir; + if (tOffset == -10) + tShakeDir *= -1; } } -static void sub_81D8BB4(void) +#undef tState +#undef tOffset +#undef tShakeDir +#undef tTimer + +static void RayCharges_AnimateBg(void) { + // Update yellow orbs ChangeBgX(2, 0x400, 2); ChangeBgY(2, 0x400, 1); + + // Update blue streaks ChangeBgX(0, 0x800, 2); ChangeBgY(0, 0x800, 1); } @@ -2449,21 +2628,26 @@ static void sub_81D8BB4(void) static void Task_RayChargesEnd(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D8BB4(); + RayCharges_AnimateBg(); if (!gPaletteFade.active) { SetVBlankCallback(NULL); - sub_81D6904(); - DestroyTask(data[2]); + ResetWindowDimensions(); + DestroyTask(tRayquazaTaskId); gTasks[taskId].func = Task_SetNextAnim; } } -static void sub_81D8C38(void) +#undef tRayquazaTaskId + + +// RAY_ANIM_CHASES_AWAY + +static void InitChasesAwaySceneBgs(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(1, sUnknown_0862AD08, ARRAY_COUNT(sUnknown_0862AD08)); + InitBgsFromTemplates(1, sBgTemplates_ChasesAway, ARRAY_COUNT(sBgTemplates_ChasesAway)); SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]); SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]); SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]); @@ -2478,237 +2662,287 @@ static void sub_81D8C38(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void sub_81D8CC4(void) +static void LoadChasesAwaySceneGfx(void) { ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(2, gRaySceneHushRing_Gfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(0, gRaySceneHushBg_Gfx, 0, 0, 0); - while (FreeTempTileDataBuffersIfPossible()); - - LZDecompressWram(gRaySceneHushRing_Tilemap, sRayScene->tilemapBuffers[1]); - LZDecompressWram(gRaySceneHushBg_Tilemap, sRayScene->tilemapBuffers[0]); - LZDecompressWram(gRaySceneHushRing_Map, sRayScene->tilemapBuffers[2]); - LoadCompressedPalette(gRaySceneHushBg_Pal, 0, 0x60); - LoadCompressedSpriteSheet(&sUnknown_0862AC28); - LoadCompressedSpriteSheet(&sUnknown_0862AC30); - LoadCompressedSpriteSheet(&sUnknown_0862AC38); - LoadCompressedSpriteSheet(&sUnknown_0862AC40); - LoadCompressedSpriteSheet(&sUnknown_0862AC48); - LoadCompressedSpriteSheet(&sUnknown_0862AC50); - LoadCompressedSpritePalette(&sUnknown_0862AC58); - LoadCompressedSpritePalette(&sUnknown_0862AC60); - LoadCompressedSpritePalette(&sUnknown_0862AC68); - LoadCompressedSpritePalette(&sUnknown_0862AC70); + DecompressAndCopyTileDataToVram(2, gRaySceneChasesAway_Ring_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(0, gRaySceneChasesAway_Light_Gfx, 0, 0, 0); + while (FreeTempTileDataBuffersIfPossible()) + ; + LZDecompressWram(gRaySceneChasesAway_Bg_Tilemap, sRayScene->tilemapBuffers[1]); + LZDecompressWram(gRaySceneChasesAway_Light_Tilemap, sRayScene->tilemapBuffers[0]); + LZDecompressWram(gRaySceneChasesAway_Ring_Tilemap, sRayScene->tilemapBuffers[2]); + LoadCompressedPalette(gRaySceneChasesAway_Bg_Pal, 0, 0x60); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Groudon); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_GroudonTail); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Kyogre); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_Rayquaza); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_RayquazaTail); + LoadCompressedSpriteSheet(&sSpriteSheet_ChasesAway_KyogreSplash); + LoadCompressedSpritePalette(&sSpritePal_ChasesAway_Groudon); + LoadCompressedSpritePalette(&sSpritePal_ChasesAway_Kyogre); + LoadCompressedSpritePalette(&sSpritePal_ChasesAway_Rayquaza); + LoadCompressedSpritePalette(&sSpritePal_ChasesAway_KyogreSplash); } +#define tState data[0] +#define tTimer data[1] +#define tBgTaskId data[2] + static void Task_RayChasesAwayAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81D8C38(); - sub_81D8CC4(); - sub_81D68C8(); + InitChasesAwaySceneBgs(); + LoadChasesAwaySceneGfx(); + SetWindowsHideVertBorders(); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 14)); BlendPalettes(-1, 0x10, 0); SetVBlankCallback(VBlankCB_RayquazaScene); - data[0] = 0; - data[1] = 0; + tState = 0; + tTimer = 0; gTasks[taskId].func = Task_HandleRayChasesAway; - data[2] = CreateTask(sub_81D8FB0, 0); - gTasks[data[2]].data[0] = 0; - gTasks[data[2]].data[1] = 0; - gTasks[data[2]].data[2] = 0; - gTasks[data[2]].data[3] = 1; - gTasks[data[2]].data[4] = 1; + tBgTaskId = CreateTask(Task_ChasesAway_AnimateBg, 0); + gTasks[tBgTaskId].data[0] = 0; + gTasks[tBgTaskId].data[1] = 0; + gTasks[tBgTaskId].data[2] = 0; + gTasks[tBgTaskId].data[3] = 1; + gTasks[tBgTaskId].data[4] = 1; } static void Task_HandleRayChasesAway(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - if (data[1] == 8) + // Delay, then fade in + if (tTimer == 8) { - sub_81D90A8(taskId); + ChasesAway_CreateTrioSprites(taskId); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } break; case 1: - if (gSprites[data[5]].callback == sub_81D97E0) + // Wait for Rayquaza to enter and finish shout anim + if (gSprites[data[5]].callback == SpriteCB_ChasesAway_RayquazaFloat) { - if (data[1] == 64) + // Delay, then start Groudon/Kyogre leaving + if (tTimer == 64) { - sub_81D94D4(taskId); - sub_81D93D8(taskId); - data[1] = 0; - data[0]++; + ChasesAway_KyogreStartLeave(taskId); + ChasesAway_GroudonStartLeave(taskId); + tTimer = 0; + tState++; } else { - data[1]++; + tTimer++; } } break; case 2: - if (data[1] == 448) + // Wait for Groudon/Kyogre to leave + if (tTimer == 448) { - data[1] = 0; - data[0]++; + tTimer = 0; + tState++; } else { - data[1]++; - if (data[1] % 144 == 0) + // Flash bg white and trio black a few times + tTimer++; + if (tTimer % 144 == 0) { - sub_80A2C44(0xFFFE, 0, 0x10, 0, -1, 0, 0); - sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1); + BlendPalettesGradually(0x0000FFFE, 0, 16, 0, RGB_WHITEALPHA, 0, 0); + BlendPalettesGradually(0xFFFF0000, 0, 16, 0, RGB_BLACK, 0, 1); } } break; case 3: + // Fade out BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_RayChasesAwayEnd; break; } } -static void sub_81D8FB0(u8 taskId) +#undef tState +#undef tTimer + +#define tTimer data[0] +#define tBlendHi data[1] +#define tBlendLo data[2] +#define tBlendHiDir data[3] +#define tBlendLoDir data[4] + +// Flickers the ray of light behind Rayquaza +static void Task_ChasesAway_AnimateBg(u8 taskId) { s16 *data = gTasks[taskId].data; - if ((data[0] & 0xF) == 0) + if ((tTimer & 0xF) == 0) { - SetGpuReg(REG_OFFSET_BLDALPHA, ((data[1] + 14) << 8 & 0x1F00) | ((data[2] + 9) & 0xF)); - data[1] -= data[3]; - data[2] += data[4]; - if (data[1] == -3 || data[1] == 0) - data[3] *= -1; - if (data[2] == 3 || data[2] == 0) - data[4] *= -1; + SetGpuReg(REG_OFFSET_BLDALPHA, ((tBlendHi + 14) << 8 & 0x1F00) | ((tBlendLo + 9) & 0xF)); + tBlendHi -= tBlendHiDir; + tBlendLo += tBlendLoDir; + if (tBlendHi == -3 || tBlendHi == 0) + tBlendHiDir *= -1; + if (tBlendLo == 3 || tBlendLo == 0) + tBlendLoDir *= -1; } - data[0]++; + tTimer++; } +#undef tTimer +#undef tBlendHi +#undef tBlendLo +#undef tBlendHiDir +#undef tBlendLoDir + +#define tTimer data[1] + static void Task_RayChasesAwayEnd(u8 taskId) { s16 *data = gTasks[taskId].data; if (!gPaletteFade.active) { StopMapMusic(); - if (data[1] == 0) + if (tTimer == 0) { SetVBlankCallback(NULL); - sub_81D6904(); + ResetWindowDimensions(); ResetSpriteData(); FreeAllSpritePalettes(); - DestroyTask(data[2]); + DestroyTask(tBgTaskId); } - if (data[1] == 32) + if (tTimer == 32) { - data[1] = 0; + tTimer = 0; gTasks[taskId].func = Task_SetNextAnim; } else { - data[1]++; + tTimer++; } } } -static void sub_81D90A8(u8 taskId) +#undef tTimer +#undef tBgTaskId + +#define tGroudonSpriteId taskData[3] +#define tKyogreSpriteId taskData[4] +#define tRayquazaSpriteId taskData[5] + +static void ChasesAway_CreateTrioSprites(u8 taskId) { s16 *taskData, *spriteData; taskData = gTasks[taskId].data; - taskData[3] = CreateSprite(&sUnknown_0862AC78, 64, 120, 0); - spriteData = gSprites[taskData[3]].data; - spriteData[0] = CreateSprite(&sUnknown_0862AC90, 16, 130, 0); - gSprites[taskData[3]].oam.priority = 1; + tGroudonSpriteId = CreateSprite(&sSpriteTemplate_ChasesAway_Groudon, 64, 120, 0); + spriteData = gSprites[tGroudonSpriteId].data; + spriteData[0] = CreateSprite(&sSpriteTemplate_ChasesAway_GroudonTail, 16, 130, 0); + gSprites[tGroudonSpriteId].oam.priority = 1; gSprites[spriteData[0]].oam.priority = 1; - taskData[4] = CreateSprite(&sUnknown_0862ACA8, 160, 128, 1); - spriteData = gSprites[taskData[4]].data; - spriteData[0] = CreateSprite(&sUnknown_0862ACA8, 192, 128, 1); - spriteData[1] = CreateSprite(&sUnknown_0862ACA8, 224, 128, 1); - gSprites[taskData[4]].oam.priority = 1; + tKyogreSpriteId = CreateSprite(&sSpriteTemplate_ChasesAway_Kyogre, 160, 128, 1); + spriteData = gSprites[tKyogreSpriteId].data; + spriteData[0] = CreateSprite(&sSpriteTemplate_ChasesAway_Kyogre, 192, 128, 1); + spriteData[1] = CreateSprite(&sSpriteTemplate_ChasesAway_Kyogre, 224, 128, 1); + gSprites[tKyogreSpriteId].oam.priority = 1; gSprites[spriteData[0]].oam.priority = 1; gSprites[spriteData[1]].oam.priority = 1; StartSpriteAnim(&gSprites[spriteData[0]], 1); StartSpriteAnim(&gSprites[spriteData[1]], 2); - taskData[5] = CreateSprite(&sUnknown_0862ACC0, 120, -65, 0); - spriteData = gSprites[taskData[5]].data; - spriteData[0] = CreateSprite(&sUnknown_0862ACD8, 120, -113, 0); - gSprites[taskData[5]].oam.priority = 1; + tRayquazaSpriteId = CreateSprite(&sSpriteTemplate_ChasesAway_Rayquaza, 120, -65, 0); + spriteData = gSprites[tRayquazaSpriteId].data; + spriteData[0] = CreateSprite(&sSpriteTemplate_ChasesAway_RayquazaTail, 120, -113, 0); + gSprites[tRayquazaSpriteId].oam.priority = 1; gSprites[spriteData[0]].oam.priority = 1; } -static void sub_81D9274(u8 taskId) +#define sBodyPartSpriteId1 data[0] +#define sBodyPartSpriteId2 data[1] +#define sTimer data[4] +#define sDecel data[5] +#define sSpeed data[6] +#define sIsKyogre data[7] + +static void ChasesAway_PushDuoBack(u8 taskId) { s16 *taskData = gTasks[taskId].data; - gSprites[taskData[3]].callback = sub_81D9338; - gSprites[taskData[3]].data[4] = 0; - gSprites[taskData[3]].data[5] = 0; - gSprites[taskData[3]].data[6] = 4; - gSprites[taskData[3]].data[7] = 0; + gSprites[tGroudonSpriteId].callback = SpriteCB_ChasesAway_DuoRingPush; + gSprites[tGroudonSpriteId].sTimer = 0; + gSprites[tGroudonSpriteId].sDecel = 0; + gSprites[tGroudonSpriteId].sSpeed = 4; + gSprites[tGroudonSpriteId].sIsKyogre = FALSE; - gSprites[taskData[4]].callback = sub_81D9338; - gSprites[taskData[4]].data[4] = 0; - gSprites[taskData[4]].data[5] = 0; - gSprites[taskData[4]].data[6] = 4; - gSprites[taskData[4]].data[7] = 1; + gSprites[tKyogreSpriteId].callback = SpriteCB_ChasesAway_DuoRingPush; + gSprites[tKyogreSpriteId].sTimer = 0; + gSprites[tKyogreSpriteId].sDecel = 0; + gSprites[tKyogreSpriteId].sSpeed = 4; + gSprites[tKyogreSpriteId].sIsKyogre = TRUE; } -static void sub_81D9338(struct Sprite *sprite) +// Pushes Groudon/Kyogre back slightly, for when Rayquaza's hyper voice ring comes out +static void SpriteCB_ChasesAway_DuoRingPush(struct Sprite *sprite) { - if ((sprite->data[4] & 7) == 0) + if ((sprite->sTimer & 7) == 0) { - if (sprite->data[7] == 0) + if (!sprite->sIsKyogre) { - sprite->pos1.x -= sprite->data[6]; - gSprites[sprite->data[0]].pos1.x -= sprite->data[6]; + sprite->pos1.x -= sprite->sSpeed; + gSprites[sprite->sBodyPartSpriteId1].pos1.x -= sprite->sSpeed; } else { - sprite->pos1.x += sprite->data[6]; - gSprites[sprite->data[0]].pos1.x += sprite->data[6]; - gSprites[sprite->data[1]].pos1.x += sprite->data[6]; + sprite->pos1.x += sprite->sSpeed; + gSprites[sprite->sBodyPartSpriteId1].pos1.x += sprite->sSpeed; + gSprites[sprite->sBodyPartSpriteId2].pos1.x += sprite->sSpeed; } - sprite->data[5]++; - sprite->data[6] -= sprite->data[5]; - if (sprite->data[5] == 3) + sprite->sDecel++; + sprite->sSpeed -= sprite->sDecel; + if (sprite->sDecel == 3) { - sprite->data[4] = 0; - sprite->data[5] = 0; - sprite->data[6] = 0; + sprite->sTimer = 0; + sprite->sDecel = 0; + sprite->sSpeed = 0; sprite->callback = SpriteCallbackDummy; return; } } - sprite->data[4]++; + sprite->sTimer++; } -static void sub_81D93D8(u8 taskId) +#undef sBodyPartSpriteId1 +#undef sBodyPartSpriteId2 +#undef sTimer +#undef sDecel +#undef sSpeed +#undef sIsKyogre + +static void ChasesAway_GroudonStartLeave(u8 taskId) { s16 *taskData = gTasks[taskId].data; - gSprites[taskData[3]].callback = sub_81D9420; - StartSpriteAnim(&gSprites[taskData[3]], 1); + gSprites[tGroudonSpriteId].callback = SpriteCB_ChasesAway_GroudonLeave; + StartSpriteAnim(&gSprites[tGroudonSpriteId], 1); } -static void sub_81D9420(struct Sprite *sprite) +static void SpriteCB_ChasesAway_GroudonLeave(struct Sprite *sprite) { switch (sprite->animCmdIndex) { @@ -2733,19 +2967,19 @@ static void sub_81D9420(struct Sprite *sprite) } } -static void sub_81D94D4(u8 taskId) +static void ChasesAway_KyogreStartLeave(u8 taskId) { s16 *taskData, *spriteData; taskData = gTasks[taskId].data; - spriteData = gSprites[taskData[4]].data; + spriteData = gSprites[tKyogreSpriteId].data; - gSprites[taskData[4]].callback = sub_81D9528; - gSprites[spriteData[0]].callback = sub_81D9528; - gSprites[spriteData[1]].callback = sub_81D9528; + gSprites[tKyogreSpriteId].callback = SpriteCB_ChasesAway_KyogreLeave; + gSprites[spriteData[0]].callback = SpriteCB_ChasesAway_KyogreLeave; + gSprites[spriteData[1]].callback = SpriteCB_ChasesAway_KyogreLeave; } -static void sub_81D9528(struct Sprite *sprite) +static void SpriteCB_ChasesAway_KyogreLeave(struct Sprite *sprite) { if ((sprite->data[4] & 3) == 0) { @@ -2756,9 +2990,9 @@ static void sub_81D9528(struct Sprite *sprite) } if (sprite->data[5] == 128) { - sprite->data[7] = CreateSprite(&sUnknown_0862ACF0, 152, 132, 0); + sprite->data[7] = CreateSprite(&sSpriteTemplate_ChasesAway_KyogreSplash, 152, 132, 0); gSprites[sprite->data[7]].oam.priority = 1; - sprite->data[7] = CreateSprite(&sUnknown_0862ACF0, 224, 132, 0); + sprite->data[7] = CreateSprite(&sSpriteTemplate_ChasesAway_KyogreSplash, 224, 132, 0); gSprites[sprite->data[7]].oam.priority = 1; gSprites[sprite->data[7]].hFlip = 1; sprite->data[5]++; @@ -2777,150 +3011,174 @@ static void sub_81D9528(struct Sprite *sprite) } if (sprite->data[4] % 64 == 0) - PlaySE(SE_W250); + PlaySE(SE_M_WHIRLPOOL); sprite->data[4]++; } -static void sub_81D961C(struct Sprite *sprite) +#define sTailSpriteId data[0] +#define sYOffset data[4] +#define sYOffsetDir data[5] +#define sFloatTimer data[6] +#define sTimer data[7] + +#define sTailFloatDelay data[4] +#define sTailFloatPeak data[5] + +static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite) { - s16 counter = sprite->data[7]; - if (counter <= 64) + s16 frame = sprite->sTimer; + if (frame <= 64) { sprite->pos2.y += 2; - gSprites[sprite->data[0]].pos2.y += 2; - if (sprite->data[7] == 64) + gSprites[sprite->sTailSpriteId].pos2.y += 2; + if (sprite->sTimer == 64) { - sub_81D9868(sprite, 1, 0, -48); - sprite->data[4] = 5; - sprite->data[5] = -1; - gSprites[sprite->data[0]].data[4] = 3; - gSprites[sprite->data[0]].data[5] = 5; + ChasesAway_SetRayquazaAnim(sprite, 1, 0, -48); + sprite->sYOffset = 5; + sprite->sYOffsetDir = -1; + gSprites[sprite->sTailSpriteId].sTailFloatDelay = 3; + gSprites[sprite->sTailSpriteId].sTailFloatPeak = 5; } } - else if (counter <= 111) + else if (frame <= 111) { - sub_81D97E0(sprite); - if (sprite->data[4] == 0) - PlaySE(SE_BT_START); - if (sprite->data[4] == -3) - sub_81D9868(sprite, 2, 48, 16); + SpriteCB_ChasesAway_RayquazaFloat(sprite); + if (sprite->sYOffset == 0) + PlaySE(SE_MUGSHOT); + if (sprite->sYOffset == -3) + ChasesAway_SetRayquazaAnim(sprite, 2, 48, 16); } - else if (counter == 112) + else if (frame == 112) { - gSprites[sprite->data[0]].data[4] = 7; - gSprites[sprite->data[0]].data[5] = 3; - sub_81D97E0(sprite); + gSprites[sprite->sTailSpriteId].sTailFloatDelay = 7; + gSprites[sprite->sTailSpriteId].sTailFloatPeak = 3; + SpriteCB_ChasesAway_RayquazaFloat(sprite); } - else if (counter <= 327) + else if (frame <= 327) { - sub_81D97E0(sprite); + SpriteCB_ChasesAway_RayquazaFloat(sprite); } - else if (counter == 328) + else if (frame == 328) { - sub_81D97E0(sprite); - sub_81D9868(sprite, 3, 48, 16); + SpriteCB_ChasesAway_RayquazaFloat(sprite); + ChasesAway_SetRayquazaAnim(sprite, 3, 48, 16); sprite->pos2.x = 1; - gSprites[sprite->data[0]].pos2.x = 1; + gSprites[sprite->sTailSpriteId].pos2.x = 1; PlayCry1(SPECIES_RAYQUAZA, 0); - CreateTask(sub_81D98B4, 0); + CreateTask(Task_ChasesAway_AnimateRing, 0); } else { - switch (counter) + switch (frame) { case 376: sprite->pos2.x = 0; - gSprites[sprite->data[0]].pos2.x = 0; - sub_81D97E0(sprite); - sub_81D9868(sprite, 2, 48, 16); - sprite->callback = sub_81D97E0; + gSprites[sprite->sTailSpriteId].pos2.x = 0; + SpriteCB_ChasesAway_RayquazaFloat(sprite); + ChasesAway_SetRayquazaAnim(sprite, 2, 48, 16); + sprite->callback = SpriteCB_ChasesAway_RayquazaFloat; return; case 352: - sub_81D9274(FindTaskIdByFunc(Task_HandleRayChasesAway)); + ChasesAway_PushDuoBack(FindTaskIdByFunc(Task_HandleRayChasesAway)); break; } } - if (sprite->data[7] > 328 && (sprite->data[7] & 1) == 0) + if (sprite->sTimer > 328 && (sprite->sTimer & 1) == 0) { sprite->pos2.x *= -1; - gSprites[sprite->data[0]].pos2.x = sprite->pos2.x; + gSprites[sprite->sTailSpriteId].pos2.x = sprite->pos2.x; } - sprite->data[7]++; + sprite->sTimer++; } -static void sub_81D97E0(struct Sprite *sprite) +static void SpriteCB_ChasesAway_RayquazaFloat(struct Sprite *body) { - struct Sprite *sprite2 = &gSprites[sprite->data[0]]; - if (!(sprite->data[6] & sprite2->data[4])) + struct Sprite *tail = &gSprites[body->sTailSpriteId]; + if (!(body->sFloatTimer & tail->sTailFloatDelay)) { - sprite->pos2.y += sprite->data[4]; - gSprites[sprite->data[0]].pos2.y += sprite->data[4]; - sprite->data[4] += sprite->data[5]; - if (sprite->data[4] >= sprite2->data[5] || sprite->data[4] <= -sprite2->data[5]) + body->pos2.y += body->sYOffset; + gSprites[body->sTailSpriteId].pos2.y += body->sYOffset; // why access gSprites again? tail->pos2.y would be sufficient + body->sYOffset += body->sYOffsetDir; + if (body->sYOffset >= tail->sTailFloatPeak || body->sYOffset <= -tail->sTailFloatPeak) { - if (sprite->data[4] > sprite2->data[5]) - sprite->data[4] = sprite2->data[5]; - else if (sprite->data[4] < -sprite2->data[5]) - sprite->data[4] = -sprite2->data[5]; + if (body->sYOffset > tail->sTailFloatPeak) + body->sYOffset = tail->sTailFloatPeak; + else if (body->sYOffset < -tail->sTailFloatPeak) + body->sYOffset = -tail->sTailFloatPeak; - sprite->data[5] *= -1; + body->sYOffsetDir *= -1; } } - sprite->data[6]++; + body->sFloatTimer++; } -static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y) +static void ChasesAway_SetRayquazaAnim(struct Sprite *body, u8 animNum, s16 x, s16 y) { - struct Sprite *sprite2 = &gSprites[sprite->data[0]]; + struct Sprite *tail = &gSprites[body->sTailSpriteId]; - sprite2->pos1.x = sprite->pos1.x + x; - sprite2->pos1.y = sprite->pos1.y + y; + tail->pos1.x = body->pos1.x + x; + tail->pos1.y = body->pos1.y + y; - sprite2->pos2.x = sprite->pos2.x; - sprite2->pos2.y = sprite->pos2.y; + tail->pos2.x = body->pos2.x; + tail->pos2.y = body->pos2.y; - StartSpriteAnim(sprite, animNum); - StartSpriteAnim(sprite2, animNum); + StartSpriteAnim(body, animNum); + StartSpriteAnim(tail, animNum); } -static void sub_81D98B4(u8 taskId) +#undef sTailSpriteId +#undef sYOffset +#undef sYOffsetDir +#undef sFloatTimer +#undef sTimer +#undef sTailFloatDelay +#undef sTailFloatPeak + +#define tState data[0] +#define tScale data[1] +#define tNumRings data[2] +#define tScaleTimer data[3] +#define tScaleSpeed data[4] +#define tSoundTimer data[5] + +static void Task_ChasesAway_AnimateRing(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - SetBgAffine(2, 0x4000, 0x4000, 0x78, 0x40, 0x100, 0x100, 0); + SetBgAffine(2, 0x4000, 0x4000, 120, 64, 256, 256, 0); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); - data[4] = 16; - data[0]++; + tScaleSpeed = 16; + tState++; break; case 1: - if (data[5] == 8) - PlaySE(SE_JIDO_DOA); - if (data[2] == 2) + if (tSoundTimer == 8) + PlaySE(SE_SLIDING_DOOR); + if (tNumRings == 2) { - data[0]++; + tState++; } else { - data[1] += data[4]; - data[5]++; - if (data[3] % 3 == 0 && data[4] != 4) - data[4] -= 2; + tScale += tScaleSpeed; + tSoundTimer++; + if (tScaleTimer % 3 == 0 && tScaleSpeed != 4) + tScaleSpeed -= 2; - data[3]++; - SetBgAffine(2, 0x4000, 0x4000, 0x78, 0x40, 0x100 - data[1], 0x100 - data[1], 0); - if (data[1] > 255) + tScaleTimer++; + SetBgAffine(2, 0x4000, 0x4000, 120, 64, 256 - tScale, 256 - tScale, 0); + if (tScale > 255) { - data[1] = 0; - data[3] = 0; - data[5] = 0; - data[4] = 16; - data[2]++; + tScale = 0; + tScaleTimer = 0; + tSoundTimer = 0; + tScaleSpeed = 16; + tNumRings++; } } break; diff --git a/src/record_mixing.c b/src/record_mixing.c index 128e401635..6c0a02d8c5 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -302,7 +302,7 @@ static void Task_RecordMixing_SoundEffect(u8 taskId) { if (++gTasks[taskId].tCounter == 50) { - PlaySE(SE_W213); + PlaySE(SE_M_ATTRACT); gTasks[taskId].tCounter = 0; } } @@ -343,7 +343,7 @@ static void Task_RecordMixing_Main(u8 taskId) case 2: data[10] = CreateTask(Task_DoRecordMixing, 10); tState = 3; - PlaySE(SE_W226); + PlaySE(SE_M_BATON_PASS); break; case 3: // wait for Task_DoRecordMixing if (!gTasks[data[10]].isActive) diff --git a/src/region_map.c b/src/region_map.c index de3b04cb2b..49b21be078 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -129,30 +129,30 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi static const u16 sRegionMap_SpecialPlaceLocations[][2] = { - {MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105}, - {MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124}, - {MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129}, - {MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_126}, - {MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_127}, - {MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_128}, - {MAPSEC_UNDERWATER_129, MAPSEC_ROUTE_129}, - {MAPSEC_UNDERWATER_SOOTOPOLIS, MAPSEC_SOOTOPOLIS_CITY}, - {MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128}, - {MAPSEC_AQUA_HIDEOUT, MAPSEC_LILYCOVE_CITY}, - {MAPSEC_AQUA_HIDEOUT_OLD, MAPSEC_LILYCOVE_CITY}, - {MAPSEC_MAGMA_HIDEOUT, MAPSEC_ROUTE_112}, - {MAPSEC_UNDERWATER_SEALED_CHAMBER, MAPSEC_ROUTE_134}, - {MAPSEC_PETALBURG_WOODS, MAPSEC_ROUTE_104}, - {MAPSEC_JAGGED_PASS, MAPSEC_ROUTE_112}, - {MAPSEC_MT_PYRE, MAPSEC_ROUTE_122}, - {MAPSEC_SKY_PILLAR, MAPSEC_ROUTE_131}, - {MAPSEC_MIRAGE_TOWER, MAPSEC_ROUTE_111}, - {MAPSEC_TRAINER_HILL, MAPSEC_ROUTE_111}, - {MAPSEC_DESERT_UNDERPASS, MAPSEC_ROUTE_114}, - {MAPSEC_ALTERING_CAVE, MAPSEC_ROUTE_103}, - {MAPSEC_ARTISAN_CAVE, MAPSEC_ROUTE_103}, - {MAPSEC_ABANDONED_SHIP, MAPSEC_ROUTE_108}, - {MAPSEC_NONE, MAPSEC_NONE} + {MAPSEC_UNDERWATER_105, MAPSEC_ROUTE_105}, + {MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124}, + {MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_129}, // BUG: Map will incorrectly display the name of Route 129 when diving on Route 125 (for Marine Cave only) + {MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_126}, + {MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_127}, + {MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128}, + {MAPSEC_UNDERWATER_129, MAPSEC_ROUTE_129}, + {MAPSEC_UNDERWATER_SOOTOPOLIS, MAPSEC_SOOTOPOLIS_CITY}, + {MAPSEC_UNDERWATER_SEAFLOOR_CAVERN, MAPSEC_ROUTE_128}, + {MAPSEC_AQUA_HIDEOUT, MAPSEC_LILYCOVE_CITY}, + {MAPSEC_AQUA_HIDEOUT_OLD, MAPSEC_LILYCOVE_CITY}, + {MAPSEC_MAGMA_HIDEOUT, MAPSEC_ROUTE_112}, + {MAPSEC_UNDERWATER_SEALED_CHAMBER, MAPSEC_ROUTE_134}, + {MAPSEC_PETALBURG_WOODS, MAPSEC_ROUTE_104}, + {MAPSEC_JAGGED_PASS, MAPSEC_ROUTE_112}, + {MAPSEC_MT_PYRE, MAPSEC_ROUTE_122}, + {MAPSEC_SKY_PILLAR, MAPSEC_ROUTE_131}, + {MAPSEC_MIRAGE_TOWER, MAPSEC_ROUTE_111}, + {MAPSEC_TRAINER_HILL, MAPSEC_ROUTE_111}, + {MAPSEC_DESERT_UNDERPASS, MAPSEC_ROUTE_114}, + {MAPSEC_ALTERING_CAVE, MAPSEC_ROUTE_103}, + {MAPSEC_ARTISAN_CAVE, MAPSEC_ROUTE_103}, + {MAPSEC_ABANDONED_SHIP, MAPSEC_ROUTE_108}, + {MAPSEC_NONE, MAPSEC_NONE} }; static const u16 sMarineCaveMapSecIds[] = @@ -651,31 +651,31 @@ static u8 ProcessRegionMapInput_Full(void) input = MAP_INPUT_NONE; gRegionMap->cursorDeltaX = 0; gRegionMap->cursorDeltaY = 0; - if (gMain.heldKeys & DPAD_UP && gRegionMap->cursorPosY > MAPCURSOR_Y_MIN) + if (JOY_HELD(DPAD_UP) && gRegionMap->cursorPosY > MAPCURSOR_Y_MIN) { gRegionMap->cursorDeltaY = -1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_DOWN && gRegionMap->cursorPosY < MAPCURSOR_Y_MAX) + if (JOY_HELD(DPAD_DOWN) && gRegionMap->cursorPosY < MAPCURSOR_Y_MAX) { gRegionMap->cursorDeltaY = +1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_LEFT && gRegionMap->cursorPosX > MAPCURSOR_X_MIN) + if (JOY_HELD(DPAD_LEFT) && gRegionMap->cursorPosX > MAPCURSOR_X_MIN) { gRegionMap->cursorDeltaX = -1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->cursorPosX < MAPCURSOR_X_MAX) + if (JOY_HELD(DPAD_RIGHT) && gRegionMap->cursorPosX < MAPCURSOR_X_MAX) { gRegionMap->cursorDeltaX = +1; input = MAP_INPUT_MOVE_START; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { input = MAP_INPUT_A_BUTTON; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { input = MAP_INPUT_B_BUTTON; } @@ -730,31 +730,31 @@ static u8 ProcessRegionMapInput_Zoomed(void) input = MAP_INPUT_NONE; gRegionMap->zoomedCursorDeltaX = 0; gRegionMap->zoomedCursorDeltaY = 0; - if (gMain.heldKeys & DPAD_UP && gRegionMap->scrollY > -0x34) + if (JOY_HELD(DPAD_UP) && gRegionMap->scrollY > -0x34) { gRegionMap->zoomedCursorDeltaY = -1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_DOWN && gRegionMap->scrollY < 0x3c) + if (JOY_HELD(DPAD_DOWN) && gRegionMap->scrollY < 0x3c) { gRegionMap->zoomedCursorDeltaY = +1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_LEFT && gRegionMap->scrollX > -0x2c) + if (JOY_HELD(DPAD_LEFT) && gRegionMap->scrollX > -0x2c) { gRegionMap->zoomedCursorDeltaX = -1; input = MAP_INPUT_MOVE_START; } - if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->scrollX < 0xac) + if (JOY_HELD(DPAD_RIGHT) && gRegionMap->scrollX < 0xac) { gRegionMap->zoomedCursorDeltaX = +1; input = MAP_INPUT_MOVE_START; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { input = MAP_INPUT_A_BUTTON; } - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { input = MAP_INPUT_B_BUTTON; } @@ -998,7 +998,7 @@ static void InitMapBasedOnPlayerLocation(void) mapHeight = gMapHeader.mapLayout->height; x = gSaveBlock1Ptr->pos.x; y = gSaveBlock1Ptr->pos.y; - if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE) + if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_SEAFLOOR_CAVERN || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE) gRegionMap->playerIsInCave = TRUE; break; case MAP_TYPE_UNDERGROUND: @@ -1089,7 +1089,7 @@ static void InitMapBasedOnPlayerLocation(void) x = 0; break; case MAPSEC_ROUTE_126: - case MAPSEC_UNDERWATER_125: + case MAPSEC_UNDERWATER_126: x = 0; if (gSaveBlock1Ptr->pos.x > 32) x++; diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index c948cde4cd..d0e815816b 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -380,7 +380,7 @@ static void Task_ResetRtc_1(u8 taskId) u8 selection = data[2]; const struct ResetRtcStruct *selectionInfo = &sUnknown_08510428[selection - 1]; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { gTasks[taskId].func = Task_ResetRtc_2; data[1] = 0; @@ -389,7 +389,7 @@ static void Task_ResetRtc_1(u8 taskId) return; } - if (gMain.newKeys & DPAD_RIGHT) + if (JOY_NEW(DPAD_RIGHT)) { if (selectionInfo->right) { @@ -399,7 +399,7 @@ static void Task_ResetRtc_1(u8 taskId) } } - if (gMain.newKeys & DPAD_LEFT) + if (JOY_NEW(DPAD_LEFT)) { if (selectionInfo->left) { @@ -411,7 +411,7 @@ static void Task_ResetRtc_1(u8 taskId) if (selection == 5) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { gLocalTime.days = data[3]; gLocalTime.hours = data[4]; @@ -423,7 +423,7 @@ static void Task_ResetRtc_1(u8 taskId) data[2] = 6; } } - else if (MoveTimeUpDown(&data[selectionInfo->dataIndex], selectionInfo->minVal, selectionInfo->maxVal, gMain.newAndRepeatedKeys & (DPAD_UP | DPAD_DOWN))) + else if (MoveTimeUpDown(&data[selectionInfo->dataIndex], selectionInfo->minVal, selectionInfo->maxVal, JOY_REPEAT(DPAD_UP | DPAD_DOWN))) { PlaySE(SE_SELECT); PrintTime(data[8], 0, 1, data[3], data[4], data[5], data[6]); @@ -532,12 +532,12 @@ static void Task_ShowResetRtcPrompt(u8 taskId) ScheduleBgCopyTilemapToVram(0); data[0]++; case 1: - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { DestroyTask(taskId); DoSoftReset(); } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); DestroyTask(taskId); @@ -611,7 +611,7 @@ static void Task_ResetRtcScreen(u8 taskId) if (TrySavingData(SAVE_NORMAL) == SAVE_STATUS_OK) { ShowMessage(gText_SaveCompleted); - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); } else { @@ -620,7 +620,7 @@ static void Task_ResetRtcScreen(u8 taskId) } data[0] = 5; case 5: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, RGB_WHITEALPHA); data[0] = 6; diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 340fc58dda..162eb3e6dc 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -776,7 +776,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } else if (rotationDirection == ROTATE_CLOCKWISE) @@ -786,7 +786,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } diff --git a/src/roulette.c b/src/roulette.c index 4ca892912a..a0d1a7dc01 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1522,7 +1522,7 @@ static void Task_HandleBetGridInput(u8 taskId) } else { - m4aSongNumStart(SE_REGI); + m4aSongNumStart(SE_SHOP); gTasks[taskId].func = Task_PlaceBet; } } @@ -1679,7 +1679,7 @@ static void Task_RollBall(u8 taskId) gTasks[taskId].tBallNum++; gTasks[taskId].tTotalBallNum++; SetBallCounterNumLeft(BALLS_PER_ROUND - gTasks[taskId].tBallNum); - m4aSongNumStart(SE_TAMAKORO); + m4aSongNumStart(SE_ROULETTE_BALL); gTasks[taskId].func = Task_RecordBallHit; } @@ -1804,14 +1804,14 @@ static void Task_PrintSpinResult(u8 taskId) case 2: // never happens if (gTasks[taskId].tMultiplier == MAX_MULTIPLIER) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); DrawStdWindowFrame(sTextWindowId, FALSE); AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(sTextWindowId, 3); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); DrawStdWindowFrame(sTextWindowId, FALSE); AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(sTextWindowId, 3); @@ -1819,7 +1819,7 @@ static void Task_PrintSpinResult(u8 taskId) break; case FALSE: default: - m4aSongNumStart(SE_HAZURE); + m4aSongNumStart(SE_FAILURE); DrawStdWindowFrame(sTextWindowId, FALSE); AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(sTextWindowId, 3); @@ -3924,7 +3924,7 @@ static void HideWheelBalls(void) UpdateBallRelativeWheelAngle(sprite); \ sprite->sBallWheelAngle = (sprite->sBallWheelAngle / DEGREES_PER_SLOT) * DEGREES_PER_SLOT + 15; \ sprite->callback = SpriteCB_BallLandInSlot; \ - m4aSongNumStartOrChange(SE_HASHI); \ + m4aSongNumStartOrChange(SE_BRIDGE_WALK); \ } // "wheelAngle" and "sBallAngle" are relative to the screen (e.g. 180 degrees for either is always screen bottom) @@ -4136,7 +4136,7 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite) sprite->animEnded = FALSE; sprite->data[2] = 0; sprite->callback = SpriteCB_UnstickBall_TaillowDrop; - m4aSongNumStart(SE_NAGERU); + m4aSongNumStart(SE_BALL_THROW); } } } @@ -4203,7 +4203,7 @@ static void SpriteCB_RollBall_TryLandAdjacent(struct Sprite *sprite) { // Ball is stuck, need Shroomish/Taillow to clear ball sprite->animPaused = TRUE; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); SetBallStuck(sprite); } } @@ -4224,7 +4224,7 @@ static void SpriteCB_RollBall_TryLand(struct Sprite *sprite) // Space has already been landed on, try to fall into adjacent space u8 slotId; u32 fallRight; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); fallRight = Random() & 1; if (fallRight) { @@ -4319,7 +4319,7 @@ static void SpriteCB_RollBall_Fast(struct Sprite *sprite) if (sRoulette->ballDistToCenter > 60.0f) return; - m4aSongNumStartOrChange(SE_TAMAKORO_E); + m4aSongNumStartOrChange(SE_ROULETTE_BALL2); sRoulette->ballFallSpeed = -(20.0f / (float)(sRoulette->ballTravelDistMed)); sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (float)(sRoulette->ballTravelDistMed)); sprite->animNum = 1; @@ -4573,7 +4573,7 @@ static void SpriteCB_ShroomishFall(struct Sprite *sprite) gSprites[sprite->sMonShadowSpriteId].data[1] = -2; gSprites[sprite->sBallShadowSpriteId].invisible = FALSE; gSprites[sprite->sBallShadowSpriteId].callback = SpriteCB_ShroomishShakeScreen; - m4aSongNumStart(SE_W070); + m4aSongNumStart(SE_M_STRENGTH); } } @@ -4596,7 +4596,7 @@ static void SpriteCB_Shroomish(struct Sprite *sprite) sprite->invisible = FALSE; sprite->data[7]++; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); sRoulette->shroomishShadowTimer = 1; sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[0]; } @@ -4643,7 +4643,7 @@ static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite) sprite->callback = SpriteCallbackDummy; sprite->invisible = TRUE; sprite->animPaused = TRUE; - m4aSongNumStop(SE_BASABASA); + m4aSongNumStop(SE_TAILLOW_WING_FLAP); DestroySprite(sprite); FreeOamMatrix(gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].oam.matrixNum); DestroySprite(&gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]]); @@ -4674,7 +4674,7 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite) } else { - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 4); sprite->callback = SpriteCB_Taillow_FlyAway; gSprites[sprite->sMonShadowSpriteId].affineAnimPaused = FALSE; @@ -4715,7 +4715,7 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite) } else { - m4aSongNumStartOrChange(SE_BASABASA); + m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP); if (sRoulette->ball->sStuckOnWheelLeft == 0) PlayCry1(SPECIES_TAILLOW, 63); else @@ -4770,5 +4770,5 @@ static void SpriteCB_Taillow(struct Sprite *sprite) } gSprites[sprite->sMonShadowSpriteId].callback = SpriteCB_TaillowShadow_FlyIn; gSprites[sprite->sMonSpriteId].callback = SpriteCB_Taillow_FlyIn; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); } diff --git a/src/save.c b/src/save.c index 3ae2f6fd53..0a2a4e7994 100644 --- a/src/save.c +++ b/src/save.c @@ -13,7 +13,7 @@ #include "link.h" #include "constants/game_stat.h" -static u16 CalculateChecksum(void *data, u16 size); +static u16 CalculateChecksum(const void *data, u16 size); static bool8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section); static u8 GetSaveValidStatus(const struct SaveSectionLocation *location); static u8 sub_8152E10(u16 a1, const struct SaveSectionLocation *location); @@ -621,7 +621,7 @@ static bool8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section) return TRUE; } -static u16 CalculateChecksum(void *data, u16 size) +static u16 CalculateChecksum(const void *data, u16 size) { u16 i; u32 checksum = 0; @@ -648,12 +648,10 @@ static void UpdateSaveAddresses(void) gRamSaveSectionLocations[i].size = sSaveSectionOffsets[i].size; } - for (i = SECTOR_ID_PKMN_STORAGE_START; i <= SECTOR_ID_PKMN_STORAGE_END; i++) + for (; i <= SECTOR_ID_PKMN_STORAGE_END; i++) //i = SECTOR_ID_PKMN_STORAGE_START; in the initialization clause does not match { gRamSaveSectionLocations[i].data = (void*)(gPokemonStoragePtr) + sSaveSectionOffsets[i].toAdd; gRamSaveSectionLocations[i].size = sSaveSectionOffsets[i].size; - - i++;i--; // needed to match } } diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 7c824e82dd..9bf0e7ed4f 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -306,7 +306,7 @@ static void CB2_GameplayCannotBeContinued(void) { gSaveFailedClockInfo[CLOCK_RUNNING] = FALSE; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0); @@ -319,7 +319,7 @@ static void CB2_FadeAndReturnToTitleScreen(void) { gSaveFailedClockInfo[CLOCK_RUNNING] = FALSE; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); SetVBlankCallback(VBlankCB); diff --git a/src/scrcmd.c b/src/scrcmd.c index d2ebcbb851..578e357fa5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1325,9 +1325,9 @@ bool8 ScrCmd_closemessage(struct ScriptContext *ctx) static bool8 WaitForAorBPress(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) return TRUE; - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) return TRUE; return FALSE; } diff --git a/src/script.c b/src/script.c index 9ba1a74297..889c25765c 100644 --- a/src/script.c +++ b/src/script.c @@ -26,9 +26,9 @@ void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTable s32 i; ctx->mode = 0; - ctx->scriptPtr = 0; + ctx->scriptPtr = NULL; ctx->stackDepth = 0; - ctx->nativePtr = 0; + ctx->nativePtr = NULL; ctx->cmdTable = cmdTable; ctx->cmdTableEnd = cmdTableEnd; @@ -55,7 +55,7 @@ void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void)) void StopScript(struct ScriptContext *ctx) { ctx->mode = 0; - ctx->scriptPtr = 0; + ctx->scriptPtr = NULL; } bool8 RunScriptCommand(struct ScriptContext *ctx) diff --git a/src/script_menu.c b/src/script_menu.c index 2b135e3012..425cdc251c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -170,7 +170,7 @@ static void Task_HandleMultichoiceInput(u8 taskId) else selection = Menu_ProcessInput(); - if (gMain.newKeys & (DPAD_UP | DPAD_DOWN)) + if (JOY_NEW(DPAD_UP | DPAD_DOWN)) { DrawLinkServicesMultichoiceMenu(tMultichoiceId); } diff --git a/src/shop.c b/src/shop.c index 4fc44beee0..6e2e82a521 100755 --- a/src/shop.c +++ b/src/shop.c @@ -1017,7 +1017,7 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) } else { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); ClearStdWindowAndFrameToTransparent(4, 0); @@ -1030,7 +1030,7 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) ConvertIntToDecimalStringN(gStringVar3, gShopDataPtr->totalCost, STR_CONV_MODE_LEFT_ALIGN, 6); BuyMenuDisplayMessage(taskId, gText_Var1AndYouWantedVar2, BuyMenuConfirmPurchase); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); ClearStdWindowAndFrameToTransparent(4, 0); @@ -1089,7 +1089,7 @@ static void BuyMenuSubtractMoney(u8 taskId) { IncrementGameStat(GAME_STAT_SHOPPED); RemoveMoney(&gSaveBlock1Ptr->money, gShopDataPtr->totalCost); - PlaySE(SE_REGI); + PlaySE(SE_SHOP); PrintMoneyAmountInMoneyBox(0, GetMoney(&gSaveBlock1Ptr->money), 0); if (gMartInfo.martType == MART_TYPE_NORMAL) @@ -1106,7 +1106,7 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId) { s16 *data = gTasks[taskId].data; - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); if (tItemId == ITEM_POKE_BALL && tItemCount > 9 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE) @@ -1122,7 +1122,7 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId) static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); BuyMenuReturnToItemList(taskId); diff --git a/src/slot_machine.c b/src/slot_machine.c index 8669b543b0..cc001bcc90 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -252,8 +252,8 @@ struct SlotMachine /*0x0E*/ s16 payout; /*0x10*/ s16 netCoinLoss; // coins lost to machine (but never goes below 0) /*0x12*/ s16 bet; - /*0x14*/ s16 reeltimePixelOffset; - /*0x16*/ s16 reeltimePosition; + /*0x14*/ s16 reelTimePixelOffset; + /*0x16*/ s16 reelTimePosition; /*0x18*/ s16 currReel; /*0x1A*/ s16 reelIncrement; // speed of reel /*0x1C*/ s16 reelPixelOffsets[NUM_REELS]; @@ -584,7 +584,7 @@ static const u16 *const sDigitalDisplay_Pal; static const s16 sInitialReelPositions[NUM_REELS][2]; static const u8 sLuckyFlagProbabilities_Top3[][6]; static const u8 sLuckyFlagProbabilities_NotTop3[][6]; -static const u8 sReeltimeProbabilities_UnluckyGame[][17]; +static const u8 sReelTimeProbabilities_UnluckyGame[][17]; static const u8 sReelTimeProbabilities_LuckyGame[][17]; static const u8 sSymToMatch[]; static const u8 sReelTimeTags[]; @@ -682,7 +682,7 @@ static const struct WindowTemplate sWindowTemplate_InfoBox = .baseBlock = 1 }; -static const u8 sColors_ReeltimeHelp[] = {TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; +static const u8 sColors_ReelTimeHelp[] = {TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static bool8 (*const sSlotActions[])(struct Task *task) = { @@ -1220,7 +1220,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task) sSlotMachine->coins -= (MAX_BET - sSlotMachine->bet); sSlotMachine->bet = MAX_BET; sSlotMachine->state = SLOT_ACTION_START_SPIN; - PlaySE(SE_REGI); + PlaySE(SE_SHOP); } else // you didn't have enough coins to bet the max { @@ -1232,7 +1232,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task) // Increase bet if (JOY_NEW(DPAD_DOWN) && sSlotMachine->coins != 0) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); LightenBetTiles(sSlotMachine->bet); sSlotMachine->coins--; sSlotMachine->bet++; @@ -1335,7 +1335,7 @@ static bool8 SlotAction_AwaitReelStop(struct Task *task) { if (JOY_NEW(A_BUTTON)) { - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); StopSlotReel(sSlotMachine->currReel); PressStopReelButton(sSlotMachine->currReel); sSlotMachine->state = SLOT_ACTION_AWAIT_ALL_REELS_STOP; @@ -1381,17 +1381,17 @@ static bool8 SlotAction_CheckMatches(struct Task *task) } if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED))) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_BIG); } else if (sSlotMachine->matchedSymbols & (1 << MATCHED_777_MIXED)) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_REG); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); CreateDigitalDisplayScene(DIG_DISPLAY_WIN); } // if you matched 777... @@ -1744,13 +1744,13 @@ static u8 AttemptsAtLuckyFlags_NotTop3(void) static u8 GetReelTimeProbability(u8 reelTimeDraw) { - if (sSlotMachine->luckyGame == FALSE) - return sReeltimeProbabilities_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; - else - return sReelTimeProbabilities_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; + if (!sSlotMachine->luckyGame) + return sReelTimeProbabilities_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; + + return sReelTimeProbabilities_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; } -static void GetReeltimeDraw(void) +static void GetReelTimeDraw(void) { u8 rval; s16 reelTimeDraw; @@ -1773,15 +1773,13 @@ static bool8 ShouldReelTimeMachineExplode(u16 i) u16 rval = Random() & 0xff; if (rval < sReelTimeExplodeProbability[i]) return TRUE; - else - return FALSE; + return FALSE; } static u16 SlowReelSpeed(void) { u8 i = 0; - u8 rval; - u8 value; + u8 rval, value; if (sSlotMachine->netCoinLoss >= 300) i = 4; else if (sSlotMachine->netCoinLoss >= 250) @@ -1911,8 +1909,7 @@ static bool8 IsFinalTask_RunAwardPayoutActions(void) { if (FindTaskIdByFunc(RunAwardPayoutActions) == TAIL_SENTINEL) return TRUE; - else - return FALSE; + return FALSE; } static void RunAwardPayoutActions(u8 taskId) @@ -1945,7 +1942,7 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) if (sSlotMachine->coins < MAX_COINS) sSlotMachine->coins++; task->data[1] = 8; - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) task->data[1] = 4; } if (IsFanfareTaskInactive() && JOY_NEW(START_BUTTON)) @@ -2000,7 +1997,7 @@ static u8 GetTag(u8 reel, s16 offset) static u8 GetNearbyReelTimeTag(s16 n) { - s16 newPosition = (sSlotMachine->reeltimePosition + n) % 6; + s16 newPosition = (sSlotMachine->reelTimePosition + n) % 6; if (newPosition < 0) newPosition += 6; return sReelTimeTags[newPosition]; @@ -2026,22 +2023,22 @@ s16 AdvanceSlotReelToNextTag(u8 reelIndex, s16 value) return offset; } -static void AdvanceReeltimeReel(s16 value) +static void AdvanceReelTimeReel(s16 value) { - sSlotMachine->reeltimePixelOffset += value; - sSlotMachine->reeltimePixelOffset %= 120; - sSlotMachine->reeltimePosition = 6 - sSlotMachine->reeltimePixelOffset / 20; + sSlotMachine->reelTimePixelOffset += value; + sSlotMachine->reelTimePixelOffset %= 120; + sSlotMachine->reelTimePosition = 6 - sSlotMachine->reelTimePixelOffset / 20; } -s16 AdvanceReeltimeReelToNextTag(s16 value) +s16 AdvanceReelTimeReelToNextTag(s16 value) { - s16 offset = sSlotMachine->reeltimePixelOffset % 20; + s16 offset = sSlotMachine->reelTimePixelOffset % 20; if (offset != 0) { if (offset < value) value = offset; - AdvanceReeltimeReel(value); - offset = sSlotMachine->reeltimePixelOffset % 20; + AdvanceReelTimeReel(value); + offset = sSlotMachine->reelTimePixelOffset % 20; } return offset; } @@ -3080,8 +3077,8 @@ static void Task_ReelTime(u8 taskId) static void ReelTime_Init(struct Task *task) { sSlotMachine->reelTimeSpinsLeft = 0; - sSlotMachine->reeltimePixelOffset = 0; - sSlotMachine->reeltimePosition = 0; + sSlotMachine->reelTimePixelOffset = 0; + sSlotMachine->reelTimePosition = 0; task->tState++; task->data[1] = 0; task->data[2] = 30; @@ -3096,9 +3093,9 @@ static void ReelTime_Init(struct Task *task) CreateReelTimeNumberSprites(); CreateReelTimeShadowSprites(); CreateReelTimeNumberGapSprite(); - GetReeltimeDraw(); + GetReelTimeDraw(); StopMapMusic(); - PlayNewMapMusic(MUS_BD_TIME); + PlayNewMapMusic(MUS_ROULETTE); } static void ReelTime_WindowEnter(struct Task *task) @@ -3119,12 +3116,12 @@ static void ReelTime_WindowEnter(struct Task *task) task->tState++; task->data[3] = 0; } - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); } static void ReelTime_WaitStartPikachu(struct Task *task) { - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); if (++task->data[5] >= 60) { task->tState++; @@ -3144,7 +3141,7 @@ static void ReelTime_PikachuSpeedUp1(struct Task *task) memcpy(reelTimeBoltDelays, sReelTimeBoltDelays, sizeof(sReelTimeBoltDelays)); memcpy(pikachuAuraFlashDelays, sPikachuAuraFlashDelays, sizeof(sPikachuAuraFlashDelays)); - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); // gradually slow down the reel task->data[4] -= 4; i = 4 - (task->data[4] >> 8); @@ -3162,7 +3159,7 @@ static void ReelTime_PikachuSpeedUp1(struct Task *task) static void ReelTime_PikachuSpeedUp2(struct Task *task) { - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); if (++task->data[5] >= 80) { task->tState++; @@ -3174,7 +3171,7 @@ static void ReelTime_PikachuSpeedUp2(struct Task *task) static void ReelTime_WaitReel(struct Task *task) { - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; if (++task->data[5] >= 80) { @@ -3185,7 +3182,7 @@ static void ReelTime_WaitReel(struct Task *task) static void ReelTime_CheckExplode(struct Task *task) { - AdvanceReeltimeReel(task->data[4] >> 8); + AdvanceReelTimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; if (++task->data[5] >= 40) { @@ -3209,19 +3206,19 @@ static void ReelTime_CheckExplode(struct Task *task) static void ReelTime_LandOnOutcome(struct Task *task) { - s16 reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20; - if (reeltimePixelOffset) + s16 reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; + if (reelTimePixelOffset) { - reeltimePixelOffset = AdvanceReeltimeReelToNextTag(task->data[4] >> 8); + reelTimePixelOffset = AdvanceReelTimeReelToNextTag(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; } else if (GetNearbyReelTimeTag(1) != sSlotMachine->reelTimeDraw) { - AdvanceReeltimeReel(task->data[4] >> 8); - reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20; + AdvanceReelTimeReel(task->data[4] >> 8); + reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; task->data[4] = (u8)task->data[4] + 0x40; } - if (reeltimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw) + if (reelTimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw) { task->data[4] = 0; // stop moving task->tState++; @@ -3240,7 +3237,7 @@ static void ReelTime_PikachuReact(struct Task *task) { task->data[4] = 0xa0; StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); } else { @@ -3252,7 +3249,7 @@ static void ReelTime_PikachuReact(struct Task *task) ResetPikaPowerBolts(); sSlotMachine->pikaPower = 0; } - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); } } } @@ -3328,8 +3325,8 @@ static void ReelTime_ExplodeMachine(struct Task *task) task->data[4] = 4; task->data[5] = 0; StopMapMusic(); - PlayFanfare(MUS_ME_ZANNEN); - PlaySE(SE_W153); + PlayFanfare(MUS_TOO_BAD); + PlaySE(SE_M_EXPLOSION); } static void ReelTime_WaitExplode(struct Task *task) @@ -3444,7 +3441,7 @@ static void InfoBox_DrawWindow(struct Task *task) static void InfoBox_AddText(struct Task *task) { - AddTextPrinterParameterized3(1, 1, 2, 5, sColors_ReeltimeHelp, 0, gText_ReelTimeHelp); + AddTextPrinterParameterized3(1, 1, 2, 5, sColors_ReelTimeHelp, 0, gText_ReelTimeHelp); CopyWindowToVram(1, 3); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->tState++; @@ -3774,7 +3771,7 @@ static void CreateReelTimeNumberSprites(void) static void SpriteCB_ReelTimeNumbers(struct Sprite *sprite) { - s16 r0 = (u16)(sSlotMachine->reeltimePixelOffset + sprite->data[7]); + s16 r0 = (u16)(sSlotMachine->reelTimePixelOffset + sprite->data[7]); r0 %= 40; sprite->pos1.y = r0 + 59; StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20)); @@ -4830,7 +4827,7 @@ static const u8 sLuckyFlagProbabilities_NotTop3[][6] = { {40, 40, 35, 35, 40, 40} }; -static const u8 sReeltimeProbabilities_UnluckyGame[][17] = { +static const u8 sReelTimeProbabilities_UnluckyGame[][17] = { {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, diff --git a/src/sound.c b/src/sound.c index 30aa8ad009..a606b5914e 100644 --- a/src/sound.c +++ b/src/sound.c @@ -41,24 +41,24 @@ static void Task_DuckBGMForPokemonCry(u8 taskId); static void RestoreBGMVolumeAfterPokemonCry(void); static const struct Fanfare sFanfares[] = { - { MUS_FANFA1, 80 }, - { MUS_FANFA4, 160 }, - { MUS_FANFA5, 220 }, - { MUS_ME_WAZA, 220 }, - { MUS_ME_ASA, 160 }, - { MUS_ME_BACHI, 340 }, - { MUS_ME_WASURE, 180 }, - { MUS_ME_KINOMI, 120 }, - { MUS_ME_TAMA, 710 }, - { MUS_ME_B_BIG, 250 }, - { MUS_ME_B_SMALL, 150 }, - { MUS_ME_ZANNEN, 160 }, - { MUS_RG_POKEFUE, 450 }, - { MUS_RG_FAN5, 170 }, - { MUS_RG_FAN2, 196 }, - { MUS_ME_POINTGET, 313 }, - { MUS_ME_SYMBOLGET, 318 }, - { MUS_ME_TORE_EYE, 135 }, + { MUS_LEVEL_UP, 80 }, + { MUS_OBTAIN_ITEM, 160 }, + { MUS_EVOLVED, 220 }, + { MUS_OBTAIN_TMHM, 220 }, + { MUS_HEAL, 160 }, + { MUS_OBTAIN_BADGE, 340 }, + { MUS_MOVE_DELETED, 180 }, + { MUS_OBTAIN_BERRY, 120 }, + { MUS_AWAKEN_LEGEND, 710 }, + { MUS_SLOTS_JACKPOT, 250 }, + { MUS_SLOTS_WIN, 150 }, + { MUS_TOO_BAD, 160 }, + { MUS_RG_POKE_FLUTE, 450 }, + { MUS_RG_OBTAIN_KEY_ITEM, 170 }, + { MUS_RG_DEX_RATING, 196 }, + { MUS_OBTAIN_B_POINTS, 313 }, + { MUS_OBTAIN_SYMBOL, 318 }, + { MUS_REGISTER_MATCH_CALL, 135 }, }; #define CRY_VOLUME 120 // was 125 in R/S diff --git a/src/start_menu.c b/src/start_menu.c index 68a3161855..fa51766e8e 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -43,7 +43,6 @@ #include "trainer_card.h" #include "window.h" #include "constants/songs.h" -#include "rom_8011DC0.h" #include "union_room.h" #include "constants/rgb.h" @@ -551,19 +550,19 @@ void ShowStartMenu(void) static bool8 HandleStartMenuInput(void) { - if (gMain.newKeys & DPAD_UP) + if (JOY_NEW(DPAD_UP)) { PlaySE(SE_SELECT); sStartMenuCursorPos = Menu_MoveCursor(-1); } - if (gMain.newKeys & DPAD_DOWN) + if (JOY_NEW(DPAD_DOWN)) { PlaySE(SE_SELECT); sStartMenuCursorPos = Menu_MoveCursor(1); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback) @@ -585,7 +584,7 @@ static bool8 HandleStartMenuInput(void) return FALSE; } - if (gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (JOY_NEW(START_BUTTON | B_BUTTON)) { RemoveExtraStartMenuWindows(); HideStartMenu(); @@ -907,12 +906,12 @@ static bool8 SaveSuccesTimer(void) { sSaveDialogTimer--; - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) { PlaySE(SE_SELECT); return TRUE; } - else if (sSaveDialogTimer == 0) + if (sSaveDialogTimer == 0) { return TRUE; } @@ -926,7 +925,7 @@ static bool8 SaveErrorTimer(void) { sSaveDialogTimer--; } - else if (gMain.heldKeys & A_BUTTON) + else if (JOY_HELD(A_BUTTON)) { return TRUE; } diff --git a/src/strings.c b/src/strings.c index 07361ba60f..fe5051d711 100644 --- a/src/strings.c +++ b/src/strings.c @@ -402,7 +402,7 @@ const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmov const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); -const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}"); +const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); @@ -1294,7 +1294,7 @@ const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!"); const u8 gText_NicknameHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?"); ALIGNED(4) const u8 gText_ReadyToBerryCrush[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p"); ALIGNED(4) const u8 gText_WaitForAllChooseBerry[] = _("Please wait while each member\nchooses a BERRY."); -ALIGNED(4) const u8 gText_EndedWithXUnitsPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p"); +ALIGNED(4) const u8 gText_EndedWithXUnitsPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_LEVEL_UP}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p"); ALIGNED(4) const u8 gText_RecordingGameResults[] = _("Recording your game results in the\nsave file.\lPlease wait."); ALIGNED(4) const u8 gText_PlayBerryCrushAgain[] = _("Want to play BERRY CRUSH again?"); ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game will be canceled."); @@ -1745,7 +1745,7 @@ const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); -const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); +const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); const u8 gText_MoveRelearnedPkmnDidNotLearnMove[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); // Unused const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); diff --git a/src/task.c b/src/task.c index a2df66de85..a97496009e 100644 --- a/src/task.c +++ b/src/task.c @@ -200,7 +200,7 @@ u8 GetTaskCount(void) void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) { - if (dataElem <= 14) + if (dataElem < NUM_TASK_DATA - 1) { gTasks[taskId].data[dataElem] = value; gTasks[taskId].data[dataElem + 1] = value >> 16; @@ -209,7 +209,7 @@ void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) u32 GetWordTaskArg(u8 taskId, u8 dataElem) { - if (dataElem <= 14) + if (dataElem < NUM_TASK_DATA - 1) return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16); else return 0; diff --git a/src/title_screen.c b/src/title_screen.c index aa91351dfe..1d6f90d74d 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -609,7 +609,7 @@ void CB2_InitTitleScreen(void) | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_OBJWIN_ON); - m4aSongNumStart(MUS_TITLE3); + m4aSongNumStart(MUS_TITLE); gMain.state = 5; break; case 5: @@ -727,24 +727,24 @@ static void Task_TitleScreenPhase2(u8 taskId) // Show Rayquaza silhouette and process main title screen input static void Task_TitleScreenPhase3(u8 taskId) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(START_BUTTON))) { FadeOutBGM(4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA); SetMainCallback2(CB2_GoToMainMenu); } - else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO) + else if (JOY_HELD(CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO) { SetMainCallback2(CB2_GoToClearSaveDataScreen); } - else if ((gMain.heldKeys & RESET_RTC_BUTTON_COMBO) == RESET_RTC_BUTTON_COMBO + else if (JOY_HELD(RESET_RTC_BUTTON_COMBO) == RESET_RTC_BUTTON_COMBO && CanResetRTC() == TRUE) { FadeOutBGM(4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); SetMainCallback2(CB2_GoToResetRtcScreen); } - else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO) + else if (JOY_HELD(BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO) { FadeOutBGM(4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); diff --git a/src/trade.c b/src/trade.c index 17967733a1..17aaba565a 100644 --- a/src/trade.c +++ b/src/trade.c @@ -30,7 +30,6 @@ #include "pokemon_summary_screen.h" #include "pokemon_storage_system.h" #include "random.h" -#include "rom_8011DC0.h" #include "save.h" #include "script.h" #include "sound.h" @@ -570,7 +569,7 @@ static void CB2_CreateTradeMenu(void) sTradeMenuData->bg3hofs = 0; SetTradePartyMonsVisible(); gMain.state++; - PlayBGM(MUS_P_SCHOOL); + PlayBGM(MUS_SCHOOL); break; case 15: SetTradePartyLiveStatuses(TRADE_PARTNER); @@ -1354,24 +1353,24 @@ static void SetReadyToTrade(void) static void TradeMenuProcessInput(void) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 0); } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) { TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 1); } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + else if (JOY_REPEAT(DPAD_LEFT)) { TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 2); } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 3); } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); @@ -1452,7 +1451,7 @@ static void TradeMenuProcessInput_SelectedMon(void) static void ChooseMonAfterButtonPress(void) { - if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))) { PlaySE(SE_SELECT); TradeMenuChooseMon(); @@ -1627,7 +1626,7 @@ static void RedrawTradeMenuAfterPressA(void) { int i; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); rbox_fill_rectangle(0); @@ -1699,7 +1698,7 @@ static void LinkTradeWaitForQueue(void) static void PartnersMonWasInvalid(void) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { SetLinkData(LINKCMD_READY_CANCEL_TRADE, 0); sTradeMenuData->tradeMenuFunc = TRADEMENUFUNC_STANDBY; @@ -2573,7 +2572,7 @@ static void sub_807AA28(struct Sprite *sprite) { if (++sprite->data[0] == 10) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sprite->data[0] = 0; } } @@ -2582,7 +2581,7 @@ static void sub_807AA4C(struct Sprite *sprite) { if (!sprite->invisible && ++sprite->data[0] == 10) { - PlaySE(SE_W207B); + PlaySE(SE_M_SWAGGER2); sprite->data[0] = 0; } } @@ -2620,7 +2619,7 @@ static void sub_807AB04(struct Sprite *sprite) { if (++sprite->data[0] == 15) { - PlaySE(SE_W107); + PlaySE(SE_M_MINIMIZE); sprite->data[0] = 0; } } @@ -3289,7 +3288,7 @@ static bool8 AnimateTradeSequenceCable(void) gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset; sTradeData->state++; sTradeData->cachedMapMusic = GetCurrentMapMusic(); - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); break; case 1: if (sTradeData->bg2hofs > 0) @@ -3449,7 +3448,7 @@ static bool8 AnimateTradeSequenceCable(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); sTradeData->state++; } gSprites[sTradeData->unk_90].pos2.y -= 3; @@ -3503,7 +3502,7 @@ static bool8 AnimateTradeSequenceCable(void) gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PARTNER]].pos2.y += 3; if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y >= -163) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -222) { @@ -3600,7 +3599,7 @@ static bool8 AnimateTradeSequenceCable(void) DestroySprite(&gSprites[sTradeData->unk_91]); SetTradeSequenceBgGpuRegs(6); sTradeData->state++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -3704,7 +3703,7 @@ static bool8 AnimateTradeSequenceCable(void) case 68: if (++sTradeData->timer == 10) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (sTradeData->timer == 250) { @@ -3729,7 +3728,7 @@ static bool8 AnimateTradeSequenceCable(void) { return TRUE; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { sTradeData->state++; } @@ -3781,7 +3780,7 @@ static bool8 AnimateTradeSequenceWireless(void) gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset; sTradeData->state++; sTradeData->cachedMapMusic = GetCurrentMapMusic(); - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); break; case 1: if (sTradeData->bg2hofs > 0) @@ -3946,7 +3945,7 @@ static bool8 AnimateTradeSequenceWireless(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); sTradeData->state++; } gSprites[sTradeData->unk_90].pos2.y -= 3; @@ -4001,7 +4000,7 @@ static bool8 AnimateTradeSequenceWireless(void) gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PARTNER]].pos2.y += 3; if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y >= -163) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -222) { @@ -4116,7 +4115,7 @@ static bool8 AnimateTradeSequenceWireless(void) DestroySprite(&gSprites[sTradeData->unk_91]); SetTradeSequenceBgGpuRegs(6); sTradeData->state++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -4219,7 +4218,7 @@ static bool8 AnimateTradeSequenceWireless(void) case 68: if (++sTradeData->timer == 10) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (sTradeData->timer == 250) { @@ -4244,7 +4243,7 @@ static bool8 AnimateTradeSequenceWireless(void) { return TRUE; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { sTradeData->state++; } @@ -4361,10 +4360,10 @@ static void sub_807E5D8(struct Sprite *sprite) { sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); if (++ sprite->data[0] == 44) { - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); sprite->callback = sub_807E64C; sprite->data[0] = 0; BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, RGB_WHITEALPHA); @@ -4394,17 +4393,17 @@ static void sub_807E6AC(struct Sprite *sprite) { sprite->data[2] ++; sprite->data[0] = 0x16; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } } else { if (sprite->data[0] == 0x42) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (sprite->data[0] == 0x5c) - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); if (sprite->data[0] == 0x6b) - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]]; if (++sprite->data[0] == 0x6c) sprite->callback = SpriteCallbackDummy; @@ -4809,7 +4808,7 @@ static void Task_AnimateWirelessSignal(u8 taskId) } if (sWirelessSignalTiming[idx][0] == 0 && counter == 0) - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); if (counter == sWirelessSignalTiming[idx][1]) { diff --git a/src/trainer_card.c b/src/trainer_card.c index c374fad07c..2d9ec2b090 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -422,7 +422,7 @@ static void Task_TrainerCard(u8 taskId) case 8: if (!UpdatePaletteFade() && !IsDma3ManagerBusyWithBgCopy()) { - PlaySE(SE_RG_CARD3); + PlaySE(SE_RG_CARD_OPEN); sData->mainState = STATE_HANDLE_INPUT_FRONT; } break; @@ -438,13 +438,13 @@ static void Task_TrainerCard(u8 taskId) DrawTrainerCardWindow(1); sData->timeColonNeedDraw = FALSE; } - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { FlipTrainerCard(); - PlaySE(SE_RG_CARD1); + PlaySE(SE_RG_CARD_FLIP); sData->mainState = STATE_WAIT_FLIP_TO_BACK; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { if (gReceivedRemoteLinkPlayers && sData->isLink && InUnionRoom() == TRUE) { @@ -460,12 +460,12 @@ static void Task_TrainerCard(u8 taskId) case STATE_WAIT_FLIP_TO_BACK: if (IsCardFlipTaskActive() && sub_8087598() != TRUE) { - PlaySE(SE_RG_CARD3); + PlaySE(SE_RG_CARD_OPEN); sData->mainState = STATE_HANDLE_INPUT_BACK; } break; case STATE_HANDLE_INPUT_BACK: - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (gReceivedRemoteLinkPlayers && sData->isLink && InUnionRoom() == TRUE) { @@ -480,10 +480,10 @@ static void Task_TrainerCard(u8 taskId) { FlipTrainerCard(); sData->mainState = STATE_WAIT_FLIP_TO_FRONT; - PlaySE(SE_RG_CARD1); + PlaySE(SE_RG_CARD_FLIP); } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { if (gReceivedRemoteLinkPlayers && sData->isLink && InUnionRoom() == TRUE) { @@ -518,7 +518,7 @@ static void Task_TrainerCard(u8 taskId) if (IsCardFlipTaskActive() && sub_8087598() != TRUE) { sData->mainState = STATE_HANDLE_INPUT_FRONT; - PlaySE(SE_RG_CARD3); + PlaySE(SE_RG_CARD_OPEN); } break; } @@ -1730,7 +1730,7 @@ static bool8 Task_SetCardFlipped(struct Task* task) sData->onBack ^= 1; task->tFlipState++; sData->allowDMACopy = TRUE; - PlaySE(SE_RG_CARD2); + PlaySE(SE_RG_CARD_FLIPPING); return FALSE; } diff --git a/src/tv.c b/src/tv.c index 37c29ed2ea..7732bb9b1a 100644 --- a/src/tv.c +++ b/src/tv.c @@ -529,7 +529,7 @@ static const u8 *const sTVFindThatGamerTextGroup[] = { gTVFindThatGamerText03 }; -static const u8 *const sTVBreakinsNewsTextGroup[] = { +static const u8 *const sTVBreakingNewsTextGroup[] = { gTVBreakingNewsText00, gTVBreakingNewsText01, gTVBreakingNewsText02, @@ -1332,7 +1332,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye } } -bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language) +bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 color, u8 sheen, u8 language) { TVShow *show; u8 name[32]; @@ -1355,7 +1355,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus StripExtCtrlCodes(name); StringCopy(show->threeCheers.worstBlenderName, name); show->threeCheers.flavor = flavor; - show->threeCheers.unk_03_3 = unused; + show->threeCheers.color = color; show->threeCheers.sheen = sheen; tv_store_id_2x(show); show->threeCheers.language = gGameLanguage; @@ -6253,7 +6253,7 @@ static void DoTVShowBreakingNewsTV(void) TVShowDone(); break; } - ShowFieldMessage(sTVBreakinsNewsTextGroup[state]); + ShowFieldMessage(sTVBreakingNewsTextGroup[state]); } static void DoTVShowSecretBaseVisit(void) diff --git a/src/union_room.c b/src/union_room.c index 639420d719..05bd8cfb05 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -445,7 +445,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) break; case LL_STATE_AWAIT_PLAYERS: Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { if (data->playerCount == 1) data->state = LL_STATE_SHUTDOWN_AND_FAIL; @@ -458,7 +458,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) && data->playerCount > GROUP_MIN(sPlayerActivityGroupSize) - 1 && GROUP_MAX(sPlayerActivityGroupSize) != 0 && sub_8012240() - && gMain.newKeys & START_BUTTON) + && JOY_NEW(START_BUTTON)) { data->state = LL_STATE_MEMBERS_OK_PROMPT; LinkRfu_StopManagerAndFinalizeSlots(); @@ -1005,7 +1005,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; case 0: id = ListMenu_ProcessInput(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != -1) + if (JOY_NEW(A_BUTTON) && id != -1) { // this unused variable along with the assignment is needed to match u32 activity = data->field_0->arr[id].gname_uname.gname.activity; @@ -1018,13 +1018,13 @@ static void Task_TryJoinLinkGroup(u8 taskId) // Trading is allowed, or not trading at all AskToJoinRfuGroup(data, id); data->state = LG_STATE_ASK_JOIN_GROUP; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); } else { StringCopy(gStringVar4, sCantTransmitToTrainerTexts[readyStatus - 1]); data->state = LG_STATE_TRADE_NOT_READY; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); } } else @@ -1032,7 +1032,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) PlaySE(SE_WALL_HIT); } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { data->state = LG_STATE_CANCEL_CHOOSE_LEADER; } @@ -1135,7 +1135,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; } - if (RfuGetStatus() == RFU_STATUS_OK && gMain.newKeys & B_BUTTON) + if (RfuGetStatus() == RFU_STATUS_OK && JOY_NEW(B_BUTTON)) data->state = LG_STATE_ASK_LEAVE_GROUP; break; case LG_STATE_ASK_LEAVE_GROUP: @@ -1889,7 +1889,7 @@ static void Task_MEvent_Leader(u8 taskId) break; case 4: Leader_SetStateIfMemberListChanged(data, 5, 6); - if (gMain.newKeys & B_BUTTON) + if (JOY_NEW(B_BUTTON)) { data->state = 13; DestroyWirelessStatusIndicatorSprite(); @@ -2104,7 +2104,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) break; case 0: id = ListMenu_ProcessInput(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != -1) + if (JOY_NEW(A_BUTTON) && id != -1) { // this unused variable along with the assignment is needed to match u32 unusedVar; @@ -2118,7 +2118,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) RedrawListMenu(data->listTaskId); IntlConvPartnerUname7(gStringVar1, &data->field_0->arr[data->leaderId]); CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.playerName, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId)); - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); data->state = 4; } else @@ -2126,7 +2126,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) PlaySE(SE_WALL_HIT); } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { data->state = 6; } @@ -2279,7 +2279,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.playerName, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId)); - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); data->state = 4; } else @@ -2289,7 +2289,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) } } } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { data->state = 6; data->refreshTimer = 0; @@ -2547,7 +2547,7 @@ static void Task_RunUnionRoom(u8 taskId) } else if (ScriptContext2_IsEnabled() != TRUE) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { if (TryInteractWithUnionRoomMember(uroom->field_0, &taskData[0], &taskData[1], uroom->spriteIds)) { @@ -2677,7 +2677,7 @@ static void Task_RunUnionRoom(u8 taskId) if (input == -2 || input == IN_UNION_ROOM) { uroom->playerSendBuffer[0] = IN_UNION_ROOM; - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); StringCopy(gStringVar4, sIfYouWantToDoSomethingTexts[gLinkPlayers[0].gender]); uroom->state = UR_STATE_REQUEST_DECLINED; } @@ -2692,7 +2692,7 @@ static void Task_RunUnionRoom(u8 taskId) else { uroom->playerSendBuffer[0] = gPlayerCurrActivity | IN_UNION_ROOM; - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_SEND_ACTIVITY_REQUEST; } } @@ -2721,7 +2721,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->playerSendBuffer[0] = ACTIVITY_TRADE | IN_UNION_ROOM; uroom->playerSendBuffer[1] = sUnionRoomTrade.species; uroom->playerSendBuffer[2] = sUnionRoomTrade.level; - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_WAIT_FOR_RESPONSE_TO_REQUEST; break; case UR_STATE_WAIT_FOR_RESPONSE_TO_REQUEST: @@ -2846,7 +2846,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->state = UR_STATE_START_ACTIVITY_FREE_UROOM; break; case UR_STATE_PLAYER_CONTACTED_YOU: - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); sub_800EF7C(); uroom->state = UR_STATE_RECV_CONTACT_DATA; uroom->recvActivityRequest[0] = 0; @@ -2881,7 +2881,7 @@ static void Task_RunUnionRoom(u8 taskId) break; case UR_STATE_HANDLE_CONTACT_DATA: ReceiveUnionRoomActivityPacket(uroom); - if (UnionRoom_HandleContactFromOtherPlayer(uroom) && gMain.newKeys & B_BUTTON) + if (UnionRoom_HandleContactFromOtherPlayer(uroom) && JOY_NEW(B_BUTTON)) { sub_8011DE0(1); StringCopy(gStringVar4, sText_ChatEnded); @@ -2908,32 +2908,32 @@ static void Task_RunUnionRoom(u8 taskId) if (!HasAtLeastTwoMonsOfLevel30OrLower()) { uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; StringCopy(gStringVar4, sText_NeedTwoMonsOfLevel30OrLower2); } else { - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_PRINT_START_ACTIVITY_MSG; } } else if (gPlayerCurrActivity == (ACTIVITY_CARD | IN_UNION_ROOM)) { - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); ViewURoomPartnerTrainerCard(gStringVar4, uroom, TRUE); uroom->state = UR_STATE_PRINT_CARD_INFO; } else { - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_PRINT_START_ACTIVITY_MSG; } break; case 1: // DECLINE case -1: uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - sub_800FE50(uroom->playerSendBuffer); + Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; GetYouDeclinedTheOfferMessage(gStringVar4, gPlayerCurrActivity); break; @@ -3754,7 +3754,7 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str printerTemplate.y = y; printerTemplate.currentX = x; printerTemplate.currentY = y; - printerTemplate.unk = 0; + printerTemplate.style = 0; gTextFlags.useAlternateDownArrow = FALSE; switch (colorIdx) diff --git a/src/union_room_chat.c b/src/union_room_chat.c index fd2a957915..ed39d3acff 100755 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -1017,12 +1017,12 @@ static void Chat_HandleInput(void) switch (sChat->funcState) { case 0: - if (gMain.newKeys & START_BUTTON) + if (JOY_NEW(START_BUTTON)) { if (sChat->bufferCursorPos) SetChatFunction(CHAT_FUNC_SEND); } - else if (gMain.newKeys & SELECT_BUTTON) + else if (JOY_NEW(SELECT_BUTTON)) { SetChatFunction(CHAT_FUNC_SWITCH); } @@ -1039,14 +1039,14 @@ static void Chat_HandleInput(void) SetChatFunction(CHAT_FUNC_ASK_QUIT); } } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { AppendTextToMessage(); StartDisplaySubtask(CHATDISPLAY_FUNC_UPDATE_MSG, 0); StartDisplaySubtask(CHATDISPLAY_FUNC_CURSOR_BLINK, 1); sChat->funcState = 1; } - else if (gMain.newKeys & R_BUTTON) + else if (JOY_NEW(R_BUTTON)) { if (sChat->currentPage != UNION_ROOM_KB_PAGE_REGISTER) { @@ -1100,7 +1100,7 @@ static void Chat_Switch(void) shouldSwitchPages = FALSE; break; case MENU_NOTHING_CHOSEN: - if (gMain.newKeys & SELECT_BUTTON) + if (JOY_NEW(SELECT_BUTTON)) { PlaySE(SE_SELECT); Menu_MoveCursor(1); @@ -1420,13 +1420,13 @@ static void Chat_Register(void) } break; case 1: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { RegisterTextAtRow(); StartDisplaySubtask(CHATDISPLAY_FUNC_RETURN_TO_KB, 0); sChat->funcState = 3; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { StartDisplaySubtask(CHATDISPLAY_FUNC_CANCEL_REGISTER, 0); sChat->funcState = 4; @@ -1457,7 +1457,7 @@ static void Chat_Register(void) sChat->funcState = 6; break; case 6: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0); sChat->funcState = 4; @@ -1591,7 +1591,7 @@ static bool32 HandleDPadInput(void) { do { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) { if (sChat->currentRow > 0) sChat->currentRow--; @@ -1599,7 +1599,7 @@ static bool32 HandleDPadInput(void) sChat->currentRow = sKeyboardPageMaxRow[sChat->currentPage]; break; } - if (gMain.newAndRepeatedKeys & DPAD_DOWN) + if (JOY_REPEAT(DPAD_DOWN)) { if (sChat->currentRow < sKeyboardPageMaxRow[sChat->currentPage]) sChat->currentRow++; @@ -1609,7 +1609,7 @@ static bool32 HandleDPadInput(void) } if (sChat->currentPage != UNION_ROOM_KB_PAGE_REGISTER) { - if (gMain.newAndRepeatedKeys & DPAD_LEFT) + if (JOY_REPEAT(DPAD_LEFT)) { if (sChat->currentCol > 0) sChat->currentCol--; @@ -1617,7 +1617,7 @@ static bool32 HandleDPadInput(void) sChat->currentCol = 4; break; } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + else if (JOY_REPEAT(DPAD_RIGHT)) { if (sChat->currentCol < 4) sChat->currentCol++; @@ -2121,7 +2121,7 @@ static void Task_ReceiveChatMessage(u8 taskId) static bool8 TryAllocDisplay(void) { - sDisplay = Alloc(sizeof(*sDisplay)); + sDisplay = Alloc(sizeof(struct UnionRoomChatDisplay)); if (sDisplay && TryAllocSprites()) { ResetBgsAndClearDma3BusyFlags(0); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index 2ff8c65070..b92b34fbd2 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -19,14 +19,14 @@ u16 Font6Func(struct TextPrinter *textPrinter) switch (textPrinter->state) { case 0: - if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && subStruct->hasPrintBeenSpedUp) + if (JOY_HELD(A_BUTTON | B_BUTTON) && subStruct->hasPrintBeenSpedUp) { textPrinter->delayCounter = 0; } if (textPrinter->delayCounter && textPrinter->textSpeed) { textPrinter->delayCounter --; - if (gTextFlags.canABSpeedUpPrint && gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (gTextFlags.canABSpeedUpPrint && JOY_NEW(A_BUTTON | B_BUTTON)) { subStruct->hasPrintBeenSpedUp = TRUE; textPrinter->delayCounter = 0; @@ -135,7 +135,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) } DecompressGlyphFont6(char_); CopyGlyphToWindow(textPrinter); - textPrinter->printerTemplate.currentX += gUnknown_03002F90.unk80 + textPrinter->printerTemplate.letterSpacing; + textPrinter->printerTemplate.currentX += gUnknown_03002F90.width + textPrinter->printerTemplate.letterSpacing; return 0; case 1: if (TextPrinterWait(textPrinter)) @@ -210,8 +210,8 @@ static void DecompressGlyphFont6(u16 glyph) DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gUnknown_03002F90.unk60)); - gUnknown_03002F90.unk80 = 0x10; - gUnknown_03002F90.unk81 = 0x10; + gUnknown_03002F90.width = 0x10; + gUnknown_03002F90.height = 0x10; } u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese) diff --git a/src/walda_phrase.c b/src/walda_phrase.c index 4b617e3b89..2b11add769 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -118,8 +118,8 @@ static u8 GetLetterTableId(u8 letter) static bool32 TryCalculateWallpaper(u16* backgroundClr, u16 *foregroundClr, u8 *iconId, u8 *patternId, u16 trainerId, u8 *phrase) { s32 i; - ALIGNED(2) u8 array[12]; - u8 charsByTableId[16]; + u8 array[9]; + u8 charsByTableId[15]; u16 *ptr; if (StringLength(phrase) != 15) diff --git a/src/wallclock.c b/src/wallclock.c index aa2bd80193..c38dd99e38 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -21,38 +21,37 @@ #include "constants/rgb.h" #include "constants/songs.h" -// static declarations - -static void WallClockMainCallback(void); -static void Task_SetClock1(u8 taskId); -static void Task_SetClock2(u8 taskId); -static void Task_SetClock3(u8 taskId); -static void Task_SetClock4(u8 taskId); -static void Task_SetClock5(u8 taskId); -static void Task_SetClock6(u8 taskId); -static void Task_ViewClock1(u8 taskId); -static void Task_ViewClock2(u8 taskId); -static void Task_ViewClock3(u8 taskId); -static void Task_ViewClock4(u8 taskId); +static void CB2_WallClock(void); +static void Task_SetClock_WaitFadeIn(u8 taskId); +static void Task_SetClock_HandleInput(u8 taskId); +static void Task_SetClock_AskConfirm(u8 taskId); +static void Task_SetClock_HandleConfirmInput(u8 taskId); +static void Task_SetClock_Confirmed(u8 taskId); +static void Task_SetClock_Exit(u8 taskId); +static void Task_ViewClock_WaitFadeIn(u8 taskId); +static void Task_ViewClock_HandleInput(u8 taskId); +static void Task_ViewClock_FadeOut(u8 taskId); +static void Task_ViewClock_Exit(u8 taskId); static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed); static bool32 AdvanceClock(u8 taskId, u8 direction); static void UpdateClockPeriod(u8 taskId, u8 direction); static void InitClockWithRtc(u8 taskId); static void SpriteCB_MinuteHand(struct Sprite *sprite); static void SpriteCB_HourHand(struct Sprite *sprite); -static void SpriteCB_AMIndicator(struct Sprite *sprite); static void SpriteCB_PMIndicator(struct Sprite *sprite); +static void SpriteCB_AMIndicator(struct Sprite *sprite); #define tMinuteHandAngle data[0] #define tHourHandAngle data[1] #define tHours data[2] #define tMinutes data[3] -#define tMvmtDir data[4] +#define tMoveDir data[4] #define tPeriod data[5] -#define tMvmtSpeed data[6] +#define tMoveSpeed data[6] -#define TAG_GFX_WALL_CLOCK_HAND 0x1000 -#define TAG_PAL_WALL_CLOCK_HAND 0x1000 +#define GFXTAG_WALL_CLOCK_HAND 0x1000 +#define PALTAG_WALL_CLOCK_MALE 0x1000 +#define PALTAG_WALL_CLOCK_FEMALE 0x1001 enum { @@ -62,17 +61,15 @@ enum enum { - MVMT_NONE, - MVMT_BACKWARD, - MVMT_FORWARD, + MOVE_NONE, + MOVE_BACKWARD, + MOVE_FORWARD, }; -// rodata +static const u32 sHand_Gfx[] = INCBIN_U32("graphics/wallclock/hand.4bpp.lz"); +static const u16 sTextPrompt_Pal[] = INCBIN_U16("graphics/wallclock/text_prompt.gbapal"); // for "Cancel" or "Confirm" -static const u32 sUnknown_085B1F58[] = INCBIN_U32("graphics/wallclock/graphics_85b1f58.4bpp.lz"); -static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal"); - -static const struct WindowTemplate gUnknown_085B21DC[] = +static const struct WindowTemplate sWindowTemplates[] = { { .bg = 0, @@ -95,7 +92,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] = DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_085B21F4 = +static const struct WindowTemplate sWindowTemplate_ConfirmYesNo = { .bg = 0, .tilemapLeft = 24, @@ -106,7 +103,7 @@ static const struct WindowTemplate gUnknown_085B21F4 = .baseBlock = 572 }; -static const struct BgTemplate gUnknown_085B21FC[] = +static const struct BgTemplate sBgTemplates[] = { { .bg = 0, @@ -128,27 +125,27 @@ static const struct BgTemplate gUnknown_085B21FC[] = } }; -static const struct CompressedSpriteSheet gUnknown_085B2208 = +static const struct CompressedSpriteSheet sSpriteSheet_ClockHand = { - sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND + sHand_Gfx, 0x2000, GFXTAG_WALL_CLOCK_HAND }; -static const u8 filler_85B2210[8] = {0}; +static const u8 sUnused[8] = {0}; -static const struct SpritePalette gUnknown_085B2218[] = +static const struct SpritePalette sSpritePalettes_Clock[] = { { - .data = gWallclockMale_Pal, - .tag = TAG_PAL_WALL_CLOCK_HAND + .data = gWallClockMale_Pal, + .tag = PALTAG_WALL_CLOCK_MALE }, { - .data = gWallclockFemale_Pal, - .tag = 0x1001 + .data = gWallClockFemale_Pal, + .tag = PALTAG_WALL_CLOCK_FEMALE }, {} }; -static const struct OamData Unknown_085B2230 = +static const struct OamData sOam_ClockHand = { .y = 160, .shape = SPRITE_SHAPE(64x64), @@ -156,51 +153,51 @@ static const struct OamData Unknown_085B2230 = .priority = 1, }; -static const union AnimCmd Unknown_085B2238[] = +static const union AnimCmd sAnim_MinuteHand[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -static const union AnimCmd Unknown_085B2240[] = +static const union AnimCmd sAnim_HourHand[] = { ANIMCMD_FRAME(64, 30), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_085B2248[] = +static const union AnimCmd *const sAnims_MinuteHand[] = { - Unknown_085B2238 + sAnim_MinuteHand }; -static const union AnimCmd *const gUnknown_085B224C[] = +static const union AnimCmd *const sAnims_HourHand[] = { - Unknown_085B2240 + sAnim_HourHand }; -static const struct SpriteTemplate gUnknown_085B2250 = +static const struct SpriteTemplate sSpriteTemplate_MinuteHand = { - .tileTag = TAG_GFX_WALL_CLOCK_HAND, - .paletteTag = TAG_PAL_WALL_CLOCK_HAND, - .oam = &Unknown_085B2230, - .anims = gUnknown_085B2248, + .tileTag = GFXTAG_WALL_CLOCK_HAND, + .paletteTag = PALTAG_WALL_CLOCK_MALE, + .oam = &sOam_ClockHand, + .anims = sAnims_MinuteHand, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_MinuteHand, }; -static const struct SpriteTemplate gUnknown_085B2268 = +static const struct SpriteTemplate sSpriteTemplate_HourHand = { - .tileTag = TAG_GFX_WALL_CLOCK_HAND, - .paletteTag = TAG_PAL_WALL_CLOCK_HAND, - .oam = &Unknown_085B2230, - .anims = gUnknown_085B224C, + .tileTag = GFXTAG_WALL_CLOCK_HAND, + .paletteTag = PALTAG_WALL_CLOCK_MALE, + .oam = &sOam_ClockHand, + .anims = sAnims_HourHand, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_HourHand, }; -static const struct OamData Unknown_085B2280 = +static const struct OamData sOam_PeriodIndicator = { .y = 160, .shape = SPRITE_SHAPE(16x16), @@ -208,50 +205,50 @@ static const struct OamData Unknown_085B2280 = .priority = 3, }; -static const union AnimCmd Unknown_085B2288[] = +static const union AnimCmd sAnim_PM[] = { ANIMCMD_FRAME(132, 30), ANIMCMD_END, }; -static const union AnimCmd Unknown_085B2290[] = +static const union AnimCmd sAnim_AM[] = { ANIMCMD_FRAME(128, 30), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_085B2298[] = +static const union AnimCmd *const sAnims_PM[] = { - Unknown_085B2288 + sAnim_PM }; -static const union AnimCmd *const gUnknown_085B229C[] = +static const union AnimCmd *const sAnims_AM[] = { - Unknown_085B2290 + sAnim_AM }; -static const struct SpriteTemplate gUnknown_085B22A0 = +static const struct SpriteTemplate sSpriteTemplate_PM = { - .tileTag = TAG_GFX_WALL_CLOCK_HAND, - .paletteTag = TAG_PAL_WALL_CLOCK_HAND, - .oam = &Unknown_085B2280, - .anims = gUnknown_085B2298, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_AMIndicator -}; - -static const struct SpriteTemplate gUnknown_085B22B8 = -{ - .tileTag = TAG_GFX_WALL_CLOCK_HAND, - .paletteTag = TAG_PAL_WALL_CLOCK_HAND, - .oam = &Unknown_085B2280, - .anims = gUnknown_085B229C, + .tileTag = GFXTAG_WALL_CLOCK_HAND, + .paletteTag = PALTAG_WALL_CLOCK_MALE, + .oam = &sOam_PeriodIndicator, + .anims = sAnims_PM, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_PMIndicator }; +static const struct SpriteTemplate sSpriteTemplate_AM = +{ + .tileTag = GFXTAG_WALL_CLOCK_HAND, + .paletteTag = PALTAG_WALL_CLOCK_MALE, + .oam = &sOam_PeriodIndicator, + .anims = sAnims_AM, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCB_AMIndicator +}; + static const s8 sClockHandCoords[][2] = { { 0x00, -0x18}, @@ -616,9 +613,7 @@ static const s8 sClockHandCoords[][2] = { 0x00, -0x19} }; -// text - -static void WallClockVblankCallback(void) +static void VBlankCB_WallClock(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -644,20 +639,18 @@ static void LoadWallClockGraphics(void) DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE); - LZ77UnCompVram(gWallclock_Gfx, (void *)VRAM); - if (gSpecialVar_0x8004 == 0) - { - LoadPalette(gWallclockMale_Pal, 0x00, 0x20); - } + LZ77UnCompVram(gWallClock_Gfx, (void *)VRAM); + + if (gSpecialVar_0x8004 == MALE) + LoadPalette(gWallClockMale_Pal, 0, 32); else - { - LoadPalette(gWallclockFemale_Pal, 0x00, 0x20); - } - LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20); - LoadPalette(sUnknown_085B21D4, 0xc0, 0x08); + LoadPalette(gWallClockFemale_Pal, 0, 32); + + LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 32); + LoadPalette(sTextPrompt_Pal, 0xc0, 8); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_085B21FC, 3); - InitWindows(gUnknown_085B21DC); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); + InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); LoadUserWindowBorderGfx(0, 0x250, 0xd0); ClearScheduledBgCopiesToVram(); @@ -666,16 +659,16 @@ static void LoadWallClockGraphics(void) ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadCompressedSpriteSheet(&gUnknown_085B2208); - LoadSpritePalettes(gUnknown_085B2218); + LoadCompressedSpriteSheet(&sSpriteSheet_ClockHand); + LoadSpritePalettes(sSpritePalettes_Clock); } static void WallClockInit(void) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); EnableInterrupts(INTR_FLAG_VBLANK); - SetVBlankCallback(WallClockVblankCallback); - SetMainCallback2(WallClockMainCallback); + SetVBlankCallback(VBlankCB_WallClock); + SetMainCallback2(CB2_WallClock); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); @@ -691,32 +684,32 @@ void CB2_StartWallClock(void) u8 spriteId; LoadWallClockGraphics(); - LZ77UnCompVram(gUnknown_08DCC648, (u16 *)BG_SCREEN_ADDR(7)); + LZ77UnCompVram(gWallClockStart_Tilemap, (u16 *)BG_SCREEN_ADDR(7)); - taskId = CreateTask(Task_SetClock1, 0); + taskId = CreateTask(Task_SetClock_WaitFadeIn, 0); gTasks[taskId].tHours = 10; gTasks[taskId].tMinutes = 0; - gTasks[taskId].tMvmtDir = 0; + gTasks[taskId].tMoveDir = 0; gTasks[taskId].tPeriod = 0; - gTasks[taskId].tMvmtSpeed = 0; + gTasks[taskId].tMoveSpeed = 0; gTasks[taskId].tMinuteHandAngle = 0; gTasks[taskId].tHourHandAngle = 300; - spriteId = CreateSprite(&gUnknown_085B2250, 120, 80, 1); + spriteId = CreateSprite(&sSpriteTemplate_MinuteHand, 120, 80, 1); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 0; - spriteId = CreateSprite(&gUnknown_085B2268, 120, 80, 0); + spriteId = CreateSprite(&sSpriteTemplate_HourHand, 120, 80, 0); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 1; - spriteId = CreateSprite(&gUnknown_085B22A0, 120, 80, 2); + spriteId = CreateSprite(&sSpriteTemplate_PM, 120, 80, 2); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 45; - spriteId = CreateSprite(&gUnknown_085B22B8, 120, 80, 2); + spriteId = CreateSprite(&sSpriteTemplate_AM, 120, 80, 2); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 90; @@ -735,11 +728,11 @@ void CB2_ViewWallClock(void) u8 angle2; LoadWallClockGraphics(); - LZ77UnCompVram(gUnknown_08DCC908, (u16 *)BG_SCREEN_ADDR(7)); + LZ77UnCompVram(gWallClockView_Tilemap, (u16 *)BG_SCREEN_ADDR(7)); - taskId = CreateTask(Task_ViewClock1, 0); + taskId = CreateTask(Task_ViewClock_WaitFadeIn, 0); InitClockWithRtc(taskId); - if (gTasks[taskId].tPeriod == 0) + if (gTasks[taskId].tPeriod == PERIOD_AM) { angle1 = 45; angle2 = 90; @@ -750,21 +743,21 @@ void CB2_ViewWallClock(void) angle2 = 135; } - spriteId = CreateSprite(&gUnknown_085B2250, 120, 80, 1); + spriteId = CreateSprite(&sSpriteTemplate_MinuteHand, 120, 80, 1); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 0; - spriteId = CreateSprite(&gUnknown_085B2268, 120, 80, 0); + spriteId = CreateSprite(&sSpriteTemplate_HourHand, 120, 80, 0); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 1; - spriteId = CreateSprite(&gUnknown_085B22A0, 120, 80, 2); + spriteId = CreateSprite(&sSpriteTemplate_PM, 120, 80, 2); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = angle1; - spriteId = CreateSprite(&gUnknown_085B22B8, 120, 80, 2); + spriteId = CreateSprite(&sSpriteTemplate_AM, 120, 80, 2); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = angle2; @@ -775,7 +768,7 @@ void CB2_ViewWallClock(void) ScheduleBgCopyTilemapToVram(2); } -static void WallClockMainCallback(void) +static void CB2_WallClock(void) { RunTasks(); AnimateSprites(); @@ -784,92 +777,90 @@ static void WallClockMainCallback(void) UpdatePaletteFade(); } -static void Task_SetClock1(u8 taskId) +static void Task_SetClock_WaitFadeIn(u8 taskId) { if (!gPaletteFade.active) { - gTasks[taskId].func = Task_SetClock2; + gTasks[taskId].func = Task_SetClock_HandleInput; } } -static void Task_SetClock2(u8 taskId) +static void Task_SetClock_HandleInput(u8 taskId) { if (gTasks[taskId].tMinuteHandAngle % 6) { - gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed); + gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMoveDir, gTasks[taskId].tMoveSpeed); } else { gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6; gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { - gTasks[taskId].func = Task_SetClock3; + gTasks[taskId].func = Task_SetClock_AskConfirm; } else { - gTasks[taskId].tMvmtDir = 0; - if (gMain.heldKeys & DPAD_LEFT) + gTasks[taskId].tMoveDir = MOVE_NONE; + + if (JOY_HELD(DPAD_LEFT)) + gTasks[taskId].tMoveDir = MOVE_BACKWARD; + + if (JOY_HELD(DPAD_RIGHT)) + gTasks[taskId].tMoveDir = MOVE_FORWARD; + + if (gTasks[taskId].tMoveDir != MOVE_NONE) { - gTasks[taskId].tMvmtDir = MVMT_BACKWARD; - } - if (gMain.heldKeys & DPAD_RIGHT) - { - gTasks[taskId].tMvmtDir = MVMT_FORWARD; - } - if (gTasks[taskId].tMvmtDir != 0) - { - if (gTasks[taskId].tMvmtSpeed < 0xFF) - { - gTasks[taskId].tMvmtSpeed++; - } - gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed); - AdvanceClock(taskId, gTasks[taskId].tMvmtDir); + if (gTasks[taskId].tMoveSpeed < 0xFF) + gTasks[taskId].tMoveSpeed++; + + gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMoveDir, gTasks[taskId].tMoveSpeed); + AdvanceClock(taskId, gTasks[taskId].tMoveDir); } else { - gTasks[taskId].tMvmtSpeed = 0; + gTasks[taskId].tMoveSpeed = 0; } } } } -static void Task_SetClock3(u8 taskId) +static void Task_SetClock_AskConfirm(u8 taskId) { DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x250, 0x0d); AddTextPrinterParameterized(0, 1, gText_IsThisTheCorrectTime, 0, 1, 0, NULL); PutWindowTilemap(0); ScheduleBgCopyTilemapToVram(0); - CreateYesNoMenu(&gUnknown_085B21F4, 0x250, 0x0d, 1); - gTasks[taskId].func = Task_SetClock4; + CreateYesNoMenu(&sWindowTemplate_ConfirmYesNo, 0x250, 0x0d, 1); + gTasks[taskId].func = Task_SetClock_HandleConfirmInput; } -static void Task_SetClock4(u8 taskId) +static void Task_SetClock_HandleConfirmInput(u8 taskId) { switch (Menu_ProcessInputNoWrapClearOnChoose()) { - case 0: //YES - PlaySE(SE_SELECT); - gTasks[taskId].func = Task_SetClock5; - break; - case 1: //B button - case -1: //NO - PlaySE(SE_SELECT); - ClearStdWindowAndFrameToTransparent(0, FALSE); - ClearWindowTilemap(0); - gTasks[taskId].func = Task_SetClock2; - break; + case 0: // YES + PlaySE(SE_SELECT); + gTasks[taskId].func = Task_SetClock_Confirmed; + break; + case 1: // NO + case MENU_B_PRESSED: + PlaySE(SE_SELECT); + ClearStdWindowAndFrameToTransparent(0, FALSE); + ClearWindowTilemap(0); + gTasks[taskId].func = Task_SetClock_HandleInput; + break; } } -static void Task_SetClock5(u8 taskId) +static void Task_SetClock_Confirmed(u8 taskId) { RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = Task_SetClock6; + gTasks[taskId].func = Task_SetClock_Exit; } -static void Task_SetClock6(u8 taskId) +static void Task_SetClock_Exit(u8 taskId) { if (!gPaletteFade.active) { @@ -878,51 +869,40 @@ static void Task_SetClock6(u8 taskId) } } -static void Task_ViewClock1(u8 taskId) +static void Task_ViewClock_WaitFadeIn(u8 taskId) { if (!gPaletteFade.active) - { - gTasks[taskId].func = Task_ViewClock2; - } + gTasks[taskId].func = Task_ViewClock_HandleInput; } -static void Task_ViewClock2(u8 taskId) +static void Task_ViewClock_HandleInput(u8 taskId) { InitClockWithRtc(taskId); - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - gTasks[taskId].func = Task_ViewClock3; - } + if (JOY_NEW(A_BUTTON | B_BUTTON)) + gTasks[taskId].func = Task_ViewClock_FadeOut; } -static void Task_ViewClock3(u8 taskId) +static void Task_ViewClock_FadeOut(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = Task_ViewClock4; + gTasks[taskId].func = Task_ViewClock_Exit; } -static void Task_ViewClock4(u8 taskId) +static void Task_ViewClock_Exit(u8 taskId) { if (!gPaletteFade.active) - { SetMainCallback2(gMain.savedCallback); - } } static u8 CalcMinHandDelta(u16 speed) { if (speed > 60) - { return 6; - } if (speed > 30) - { return 3; - } if (speed > 10) - { return 2; - } + return 1; } @@ -931,18 +911,18 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed) u8 delta = CalcMinHandDelta(speed); switch (direction) { - case MVMT_BACKWARD: - if (angle) - angle -= delta; - else - angle = 360 - delta; - break; - case MVMT_FORWARD: - if (angle < 360 - delta) - angle += delta; - else - angle = 0; - break; + case MOVE_BACKWARD: + if (angle) + angle -= delta; + else + angle = 360 - delta; + break; + case MOVE_FORWARD: + if (angle < 360 - delta) + angle += delta; + else + angle = 0; + break; } return angle; } @@ -951,44 +931,40 @@ static bool32 AdvanceClock(u8 taskId, u8 direction) { switch (direction) { - case MVMT_BACKWARD: - if (gTasks[taskId].tMinutes > 0) - { - gTasks[taskId].tMinutes--; - } + case MOVE_BACKWARD: + if (gTasks[taskId].tMinutes > 0) + { + gTasks[taskId].tMinutes--; + } + else + { + gTasks[taskId].tMinutes = 59; + + if (gTasks[taskId].tHours > 0) + gTasks[taskId].tHours--; else - { - gTasks[taskId].tMinutes = 59; - if (gTasks[taskId].tHours > 0) - { - gTasks[taskId].tHours--; - } - else - { - gTasks[taskId].tHours = 23; - } - UpdateClockPeriod(taskId, direction); - } - break; - case MVMT_FORWARD: - if (gTasks[taskId].tMinutes < 59) - { - gTasks[taskId].tMinutes++; - } + gTasks[taskId].tHours = 23; + + UpdateClockPeriod(taskId, direction); + } + break; + case MOVE_FORWARD: + if (gTasks[taskId].tMinutes < 59) + { + gTasks[taskId].tMinutes++; + } + else + { + gTasks[taskId].tMinutes = 0; + + if (gTasks[taskId].tHours < 23) + gTasks[taskId].tHours++; else - { - gTasks[taskId].tMinutes = 0; - if (gTasks[taskId].tHours < 23) - { - gTasks[taskId].tHours++; - } - else - { - gTasks[taskId].tHours = 0; - } - UpdateClockPeriod(taskId, direction); - } - break; + gTasks[taskId].tHours = 0; + + UpdateClockPeriod(taskId, direction); + } + break; } return FALSE; } @@ -998,28 +974,28 @@ static void UpdateClockPeriod(u8 taskId, u8 direction) u8 hours = gTasks[taskId].tHours; switch (direction) { - case MVMT_BACKWARD: - switch (hours) - { - case 11: - gTasks[taskId].tPeriod = PERIOD_AM; - break; - case 23: - gTasks[taskId].tPeriod = PERIOD_PM; - break; - } + case MOVE_BACKWARD: + switch (hours) + { + case 11: + gTasks[taskId].tPeriod = PERIOD_AM; break; - case MVMT_FORWARD: - switch (hours) - { - case 0: - gTasks[taskId].tPeriod = PERIOD_AM; - break; - case 12: - gTasks[taskId].tPeriod = PERIOD_PM; - break; - } + case 23: + gTasks[taskId].tPeriod = PERIOD_PM; break; + } + break; + case MOVE_FORWARD: + switch (hours) + { + case 0: + gTasks[taskId].tPeriod = PERIOD_AM; + break; + case 12: + gTasks[taskId].tPeriod = PERIOD_PM; + break; + } + break; } } @@ -1030,14 +1006,11 @@ static void InitClockWithRtc(u8 taskId) gTasks[taskId].tMinutes = gLocalTime.minutes; gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6; gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5; + if (gLocalTime.hours < 12) - { gTasks[taskId].tPeriod = PERIOD_AM; - } else - { gTasks[taskId].tPeriod = PERIOD_PM; - } } static void SpriteCB_MinuteHand(struct Sprite *sprite) @@ -1045,22 +1018,19 @@ static void SpriteCB_MinuteHand(struct Sprite *sprite) u16 angle = gTasks[sprite->data[0]].tMinuteHandAngle; s16 sin = Sin2(angle) / 16; s16 cos = Cos2(angle) / 16; - u16 xhat, yhat; + u16 x, y; SetOamMatrix(0, cos, sin, -sin, cos); - xhat = sClockHandCoords[angle][0]; - yhat = sClockHandCoords[angle][1]; + x = sClockHandCoords[angle][0]; + y = sClockHandCoords[angle][1]; - if (xhat > 0x80) - { - xhat |= 0xff00; - } - if (yhat > 0x80) - { - yhat |= 0xff00; - } - sprite->pos2.x = xhat; - sprite->pos2.y = yhat; + if (x > 128) + x |= 0xff00; + if (y > 128) + y |= 0xff00; + + sprite->pos2.x = x; + sprite->pos2.y = y; } static void SpriteCB_HourHand(struct Sprite *sprite) @@ -1068,26 +1038,24 @@ static void SpriteCB_HourHand(struct Sprite *sprite) u16 angle = gTasks[sprite->data[0]].tHourHandAngle; s16 sin = Sin2(angle) / 16; s16 cos = Cos2(angle) / 16; - u16 xhat, yhat; + u16 x, y; SetOamMatrix(1, cos, sin, -sin, cos); - xhat = sClockHandCoords[angle][0]; - yhat = sClockHandCoords[angle][1]; - if (xhat > 0x80) - { - xhat |= 0xff00; - } - if (yhat > 0x80) - { - yhat |= 0xff00; - } - sprite->pos2.x = xhat; - sprite->pos2.y = yhat; + x = sClockHandCoords[angle][0]; + y = sClockHandCoords[angle][1]; + + if (x > 128) + x |= 0xff00; + if (y > 128) + y |= 0xff00; + + sprite->pos2.x = x; + sprite->pos2.y = y; } -static void SpriteCB_AMIndicator(struct Sprite *sprite) +static void SpriteCB_PMIndicator(struct Sprite *sprite) { - if (gTasks[sprite->data[0]].tPeriod) + if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM) { if (sprite->data[1] >= 60 && sprite->data[1] < 90) { @@ -1113,9 +1081,9 @@ static void SpriteCB_AMIndicator(struct Sprite *sprite) sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000; } -static void SpriteCB_PMIndicator(struct Sprite *sprite) +static void SpriteCB_AMIndicator(struct Sprite *sprite) { - if (gTasks[sprite->data[0]].tPeriod) + if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM) { if (sprite->data[1] >= 105 && sprite->data[1] < 135) { diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 87b200f14a..81fa16720a 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -237,7 +237,7 @@ static void PrintHeaderTexts(void) FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0)); WCSS_AddTextPrinterParameterized(0, 1, sHeaderTexts[0], GetStringCenterAlignXOffset(1, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN); - for (i = 0; i < (int)ARRAY_COUNT(*sHeaderTexts) - 1; i++) + for (i = 0; i < (int)ARRAY_COUNT(sHeaderTexts[0]) - 1; i++) { WCSS_AddTextPrinterParameterized(1, 1, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_WHITE_LGRAY); } @@ -362,12 +362,12 @@ static u32 CountPlayersInGroupAndGetActivity(struct UnkStruct_x20 * unk20, u32 * { if (group_players(i) == 0) { - k = 0; + k = 0; //Should just be 1 without the increment after the loop ends but that doesn't match. for (j = 0; j < RFU_CHILD_MAX; j++) { if (unk20->gname_uname.gname.child_sprite_gender[j] != 0) k++; } - k++; + k++; //See above comment. groupCounts[group_type(i)] += k; } else diff --git a/sym_common.txt b/sym_common.txt index e2c50fdaa9..02fde8971a 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -63,7 +63,7 @@ gReservedSpritePaletteCount: .include "save.o" .include "battle_tower.o" .include "intro.o" - .include "battle_anim_special.o" + .include "battle_anim_throw.o" .include "battle_factory_screen.o" .include "apprentice.o"