dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts

Browse Source
This commit is contained in:
Kurausukun
2020-11-02 18:43:40 -05:00
parent 8bf401c227 9794b077b5
commit 6545745e59
383 changed files with 22968 additions and 22552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/pull_request_template.md
+8
View File
@@ -0,0 +1,8 @@
<!--- Provide a general summary of your changes in the Title above -->
## Description
<!--- Describe your changes in detail -->
## **Discord contact info**
<!--- formatted as name#numbers, e.g. PikalaxALT#5823 -->
<!--- Contributors must join https://discord.gg/d5dubZ3 -->
INSTALL.md
+1 -1
View File
@@ -8,7 +8,7 @@
[terminal]: https://docs.microsoft.com/windows/terminal/get-started [terminal]: https://docs.microsoft.com/windows/terminal/get-started
[wsl]: https://docs.microsoft.com/windows/wsl/install-win10 [wsl]: https://docs.microsoft.com/windows/wsl/install-win10
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. Independently from the specific OS, make sure that the `gcc`, `g++`, `make`, `git`, and `libpng-dev` 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.
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 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.
Makefile
+1 -1
View File
@@ -178,7 +178,7 @@ mostlyclean: tidy
rm -f $(SAMPLE_SUBDIR)/*.bin rm -f $(SAMPLE_SUBDIR)/*.bin
rm -f $(CRY_SUBDIR)/*.bin rm -f $(CRY_SUBDIR)/*.bin
rm -f $(MID_SUBDIR)/*.s rm -f $(MID_SUBDIR)/*.s
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
asm/macros/event.inc
+7
View File
@@ -1434,6 +1434,7 @@
@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text,
@ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. @ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro textcolor color:req .macro textcolor color:req
.byte 0xc7 .byte 0xc7
.byte \color .byte \color
@@ -1441,6 +1442,7 @@
@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom
@ of the screen when the Main Menu is opened. @ of the screen when the Main Menu is opened.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro loadhelp pointer:req .macro loadhelp pointer:req
.byte 0xc8 .byte 0xc8
.4byte \pointer .4byte \pointer
@@ -1448,21 +1450,25 @@
@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of
@ the screen when the Main Menu is opened. @ the screen when the Main Menu is opened.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro unloadhelp .macro unloadhelp
.byte 0xc9 .byte 0xc9
.endm .endm
@ After using this command, all standard message boxes will use the signpost frame. @ After using this command, all standard message boxes will use the signpost frame.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro signmsg .macro signmsg
.byte 0xca .byte 0xca
.endm .endm
@ Ends the effects of signmsg, returning message box frames to normal. @ Ends the effects of signmsg, returning message box frames to normal.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro normalmsg .macro normalmsg
.byte 0xcb .byte 0xcb
.endm .endm
@ Compares the value of a hidden variable to a dword. @ Compares the value of a hidden variable to a dword.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro comparehiddenvar a:req, value:req .macro comparehiddenvar a:req, value:req
.byte 0xcc .byte 0xcc
.byte \a .byte \a
@@ -1489,6 +1495,7 @@
.endm .endm
@ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot. @ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro setworldmapflag worldmapflag:req .macro setworldmapflag worldmapflag:req
.byte 0xd0 .byte 0xd0
.2byte \worldmapflag .2byte \worldmapflag
asm/macros/music_voice.inc
+59 -32
View File
@@ -1,19 +1,19 @@
.macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 0 .byte 0
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound_no_resample base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 8 .byte 8
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro voice_directsound_alt base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 16 .byte 16
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release .macro _voice_directsound base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte \base_midi_key .byte \base_midi_key
.byte 0 .byte 0
.if \pan != 0 .if \pan != 0
@@ -28,16 +28,22 @@
.byte \release .byte \release
.endm .endm
.macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release .macro voice_square_1 base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_1 1, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release .macro voice_square_1_alt base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_1 9, \base_midi_key, \pan, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release .macro _voice_square_1 type:req, base_midi_key:req, pan:req, sweep:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
.byte \type, 60, 0 .byte \type
.byte \base_midi_key
.if \pan != 0
.byte (0x80 | \pan)
.else
.byte 0
.endif
.byte \sweep .byte \sweep
.byte (\duty_cycle & 0x3) .byte (\duty_cycle & 0x3)
.byte 0, 0, 0 .byte 0, 0, 0
@@ -47,16 +53,23 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_square_2 duty_cycle, attack, decay, sustain, release .macro voice_square_2 base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_2 2, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_square_2_alt duty_cycle, attack, decay, sustain, release .macro voice_square_2_alt base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
_voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release _voice_square_2 10, \base_midi_key, \pan, \duty_cycle, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release .macro _voice_square_2 type:req, base_midi_key:req, pan:req, duty_cycle:req, attack:req, decay:req, sustain:req, release:req
.byte \type, 60, 0, 0 .byte \type
.byte \base_midi_key
.if \pan != 0
.byte (0x80 | \pan)
.else
.byte 0
.endif
.byte 0
.byte (\duty_cycle & 0x3) .byte (\duty_cycle & 0x3)
.byte 0, 0, 0 .byte 0, 0, 0
.byte (\attack & 0x7) .byte (\attack & 0x7)
@@ -65,16 +78,23 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release .macro voice_programmable_wave base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
_voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release _voice_programmable_wave 3, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release .macro voice_programmable_wave_alt base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
_voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release _voice_programmable_wave 11, \base_midi_key, \pan, \wave_samples_pointer, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release .macro _voice_programmable_wave type:req, base_midi_key:req, pan:req, wave_samples_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte \type, 60, 0, 0 .byte \type
.byte \base_midi_key
.if \pan != 0
.byte (0x80 | \pan)
.else
.byte 0
.endif
.byte 0
.4byte \wave_samples_pointer .4byte \wave_samples_pointer
.byte (\attack & 0x7) .byte (\attack & 0x7)
.byte (\decay & 0x7) .byte (\decay & 0x7)
@@ -82,16 +102,23 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_noise period, attack, decay, sustain, release .macro voice_noise base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
_voice_noise 4, \period, \attack, \decay, \sustain, \release _voice_noise 4, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release
.endm .endm
.macro voice_noise_alt period, attack, decay, sustain, release .macro voice_noise_alt base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
_voice_noise 12, \period, \attack, \decay, \sustain, \release _voice_noise 12, \base_midi_key, \pan, \period, \attack, \decay, \sustain, \release
.endm .endm
.macro _voice_noise type, period, attack, decay, sustain, release .macro _voice_noise type:req, base_midi_key:req, pan:req, period:req, attack:req, decay:req, sustain:req, release:req
.byte \type, 60, 0, 0 .byte \type
.byte \base_midi_key
.if \pan != 0
.byte (0x80 | \pan)
.else
.byte 0
.endif
.byte 0
.byte (\period & 0x1) .byte (\period & 0x1)
.byte 0, 0, 0 .byte 0, 0, 0
.byte (\attack & 0x7) .byte (\attack & 0x7)
@@ -100,25 +127,25 @@
.byte (\release & 0x7) .byte (\release & 0x7)
.endm .endm
.macro voice_keysplit voice_group_pointer, keysplit_table_pointer .macro voice_keysplit voice_group_pointer:req, keysplit_table_pointer:req
.byte 0x40, 0, 0, 0 .byte 0x40, 0, 0, 0
.4byte \voice_group_pointer .4byte \voice_group_pointer
.4byte \keysplit_table_pointer .4byte \keysplit_table_pointer
.endm .endm
.macro voice_keysplit_all voice_group_pointer .macro voice_keysplit_all voice_group_pointer:req
.byte 0x80, 0, 0, 0 .byte 0x80, 0, 0, 0
.4byte \voice_group_pointer .4byte \voice_group_pointer
.4byte 0 .4byte 0
.endm .endm
.macro cry sample .macro cry sample:req
.byte 0x20, 60, 0, 0 .byte 0x20, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
.endm .endm
.macro cry2 sample .macro cry2 sample:req
.byte 0x30, 60, 0, 0 .byte 0x30, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
common_syms/battle_tower.txt
+1 -1
View File
@@ -1 +1 @@
gUnknown_03006298 gFrontierTempParty
data/maps/NewMauville_Inside/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemUltraRope", "script": "NewMauville_Inside_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
}, },
{ {
data/mystery_event_script_cmd_table.s
+17 -17
View File
@@ -2,21 +2,21 @@
.align 2 .align 2
gMysteryEventScriptCmdTable:: @ 82DED2C gMysteryEventScriptCmdTable:: @ 82DED2C
.4byte MEScrCmd_nop .4byte MEScrCmd_nop @ 0x00
.4byte MEScrCmd_checkcompat .4byte MEScrCmd_checkcompat @ 0x01
.4byte MEScrCmd_end .4byte MEScrCmd_end @ 0x02
.4byte MEScrCmd_setmsg .4byte MEScrCmd_setmsg @ 0x03
.4byte MEScrCmd_setstatus .4byte MEScrCmd_setstatus @ 0x04
.4byte MEScrCmd_runscript .4byte MEScrCmd_runscript @ 0x05
.4byte MEScrCmd_initramscript .4byte MEScrCmd_initramscript @ 0x06
.4byte MEScrCmd_setenigmaberry .4byte MEScrCmd_setenigmaberry @ 0x07
.4byte MEScrCmd_giveribbon .4byte MEScrCmd_giveribbon @ 0x08
.4byte MEScrCmd_givenationaldex .4byte MEScrCmd_givenationaldex @ 0x09
.4byte MEScrCmd_addrareword .4byte MEScrCmd_addrareword @ 0x0a
.4byte MEScrCmd_setrecordmixinggift .4byte MEScrCmd_setrecordmixinggift @ 0x0b
.4byte MEScrCmd_givepokemon .4byte MEScrCmd_givepokemon @ 0x0c
.4byte MEScrCmd_addtrainer .4byte MEScrCmd_addtrainer @ 0x0d
.4byte MEScrCmd_enableresetrtc .4byte MEScrCmd_enableresetrtc @ 0x0e
.4byte MEScrCmd_checksum .4byte MEScrCmd_checksum @ 0x0f
.4byte MEScrCmd_crc .4byte MEScrCmd_crc @ 0x10
gMysteryEventScriptCmdTableEnd:: gMysteryEventScriptCmdTableEnd::
data/script_cmd_table.inc
+227 -227
View File
@@ -1,232 +1,232 @@
.align 2 .align 2
gScriptCmdTable:: @ 81DB67C gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_nop .4byte ScrCmd_nop @ 0x00
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0x01
.4byte ScrCmd_end .4byte ScrCmd_end @ 0x02
.4byte ScrCmd_return .4byte ScrCmd_return @ 0x03
.4byte ScrCmd_call .4byte ScrCmd_call @ 0x04
.4byte ScrCmd_goto .4byte ScrCmd_goto @ 0x05
.4byte ScrCmd_goto_if .4byte ScrCmd_goto_if @ 0x06
.4byte ScrCmd_call_if .4byte ScrCmd_call_if @ 0x07
.4byte ScrCmd_gotostd .4byte ScrCmd_gotostd @ 0x08
.4byte ScrCmd_callstd .4byte ScrCmd_callstd @ 0x09
.4byte ScrCmd_gotostd_if .4byte ScrCmd_gotostd_if @ 0x0a
.4byte ScrCmd_callstd_if .4byte ScrCmd_callstd_if @ 0x0b
.4byte ScrCmd_returnram .4byte ScrCmd_returnram @ 0x0c
.4byte ScrCmd_killscript .4byte ScrCmd_killscript @ 0x0d
.4byte ScrCmd_setmysteryeventstatus .4byte ScrCmd_setmysteryeventstatus @ 0x0e
.4byte ScrCmd_loadword .4byte ScrCmd_loadword @ 0x0f
.4byte ScrCmd_loadbyte .4byte ScrCmd_loadbyte @ 0x10
.4byte ScrCmd_writebytetoaddr .4byte ScrCmd_writebytetoaddr @ 0x11
.4byte ScrCmd_loadbytefromaddr .4byte ScrCmd_loadbytefromaddr @ 0x12
.4byte ScrCmd_setptrbyte .4byte ScrCmd_setptrbyte @ 0x13
.4byte ScrCmd_copylocal .4byte ScrCmd_copylocal @ 0x14
.4byte ScrCmd_copybyte .4byte ScrCmd_copybyte @ 0x15
.4byte ScrCmd_setvar .4byte ScrCmd_setvar @ 0x16
.4byte ScrCmd_addvar .4byte ScrCmd_addvar @ 0x17
.4byte ScrCmd_subvar .4byte ScrCmd_subvar @ 0x18
.4byte ScrCmd_copyvar .4byte ScrCmd_copyvar @ 0x19
.4byte ScrCmd_setorcopyvar .4byte ScrCmd_setorcopyvar @ 0x1a
.4byte ScrCmd_compare_local_to_local .4byte ScrCmd_compare_local_to_local @ 0x1b
.4byte ScrCmd_compare_local_to_value .4byte ScrCmd_compare_local_to_value @ 0x1c
.4byte ScrCmd_compare_local_to_addr .4byte ScrCmd_compare_local_to_addr @ 0x1d
.4byte ScrCmd_compare_addr_to_local .4byte ScrCmd_compare_addr_to_local @ 0x1e
.4byte ScrCmd_compare_addr_to_value .4byte ScrCmd_compare_addr_to_value @ 0x1f
.4byte ScrCmd_compare_addr_to_addr .4byte ScrCmd_compare_addr_to_addr @ 0x20
.4byte ScrCmd_compare_var_to_value .4byte ScrCmd_compare_var_to_value @ 0x21
.4byte ScrCmd_compare_var_to_var .4byte ScrCmd_compare_var_to_var @ 0x22
.4byte ScrCmd_callnative .4byte ScrCmd_callnative @ 0x23
.4byte ScrCmd_gotonative .4byte ScrCmd_gotonative @ 0x24
.4byte ScrCmd_special .4byte ScrCmd_special @ 0x25
.4byte ScrCmd_specialvar .4byte ScrCmd_specialvar @ 0x26
.4byte ScrCmd_waitstate .4byte ScrCmd_waitstate @ 0x27
.4byte ScrCmd_delay .4byte ScrCmd_delay @ 0x28
.4byte ScrCmd_setflag .4byte ScrCmd_setflag @ 0x29
.4byte ScrCmd_clearflag .4byte ScrCmd_clearflag @ 0x2a
.4byte ScrCmd_checkflag .4byte ScrCmd_checkflag @ 0x2b
.4byte ScrCmd_initclock .4byte ScrCmd_initclock @ 0x2c
.4byte ScrCmd_dotimebasedevents .4byte ScrCmd_dotimebasedevents @ 0x2d
.4byte ScrCmd_gettime .4byte ScrCmd_gettime @ 0x2e
.4byte ScrCmd_playse .4byte ScrCmd_playse @ 0x2f
.4byte ScrCmd_waitse .4byte ScrCmd_waitse @ 0x30
.4byte ScrCmd_playfanfare .4byte ScrCmd_playfanfare @ 0x31
.4byte ScrCmd_waitfanfare .4byte ScrCmd_waitfanfare @ 0x32
.4byte ScrCmd_playbgm .4byte ScrCmd_playbgm @ 0x33
.4byte ScrCmd_savebgm .4byte ScrCmd_savebgm @ 0x34
.4byte ScrCmd_fadedefaultbgm .4byte ScrCmd_fadedefaultbgm @ 0x35
.4byte ScrCmd_fadenewbgm .4byte ScrCmd_fadenewbgm @ 0x36
.4byte ScrCmd_fadeoutbgm .4byte ScrCmd_fadeoutbgm @ 0x37
.4byte ScrCmd_fadeinbgm .4byte ScrCmd_fadeinbgm @ 0x38
.4byte ScrCmd_warp .4byte ScrCmd_warp @ 0x39
.4byte ScrCmd_warpsilent .4byte ScrCmd_warpsilent @ 0x3a
.4byte ScrCmd_warpdoor .4byte ScrCmd_warpdoor @ 0x3b
.4byte ScrCmd_warphole .4byte ScrCmd_warphole @ 0x3c
.4byte ScrCmd_warpteleport .4byte ScrCmd_warpteleport @ 0x3d
.4byte ScrCmd_setwarp .4byte ScrCmd_setwarp @ 0x3e
.4byte ScrCmd_setdynamicwarp .4byte ScrCmd_setdynamicwarp @ 0x3f
.4byte ScrCmd_setdivewarp .4byte ScrCmd_setdivewarp @ 0x40
.4byte ScrCmd_setholewarp .4byte ScrCmd_setholewarp @ 0x41
.4byte ScrCmd_getplayerxy .4byte ScrCmd_getplayerxy @ 0x42
.4byte ScrCmd_getpartysize .4byte ScrCmd_getpartysize @ 0x43
.4byte ScrCmd_additem .4byte ScrCmd_additem @ 0x44
.4byte ScrCmd_removeitem .4byte ScrCmd_removeitem @ 0x45
.4byte ScrCmd_checkitemspace .4byte ScrCmd_checkitemspace @ 0x46
.4byte ScrCmd_checkitem .4byte ScrCmd_checkitem @ 0x47
.4byte ScrCmd_checkitemtype .4byte ScrCmd_checkitemtype @ 0x48
.4byte ScrCmd_addpcitem .4byte ScrCmd_addpcitem @ 0x49
.4byte ScrCmd_checkpcitem .4byte ScrCmd_checkpcitem @ 0x4a
.4byte ScrCmd_adddecoration .4byte ScrCmd_adddecoration @ 0x4b
.4byte ScrCmd_removedecoration .4byte ScrCmd_removedecoration @ 0x4c
.4byte ScrCmd_checkdecor .4byte ScrCmd_checkdecor @ 0x4d
.4byte ScrCmd_checkdecorspace .4byte ScrCmd_checkdecorspace @ 0x4e
.4byte ScrCmd_applymovement .4byte ScrCmd_applymovement @ 0x4f
.4byte ScrCmd_applymovement_at .4byte ScrCmd_applymovement_at @ 0x50
.4byte ScrCmd_waitmovement .4byte ScrCmd_waitmovement @ 0x51
.4byte ScrCmd_waitmovement_at .4byte ScrCmd_waitmovement_at @ 0x52
.4byte ScrCmd_removeobject .4byte ScrCmd_removeobject @ 0x53
.4byte ScrCmd_removeobject_at .4byte ScrCmd_removeobject_at @ 0x54
.4byte ScrCmd_addobject .4byte ScrCmd_addobject @ 0x55
.4byte ScrCmd_addobject_at .4byte ScrCmd_addobject_at @ 0x56
.4byte ScrCmd_setobjectxy .4byte ScrCmd_setobjectxy @ 0x57
.4byte ScrCmd_showobject_at .4byte ScrCmd_showobject_at @ 0x58
.4byte ScrCmd_hideobject_at .4byte ScrCmd_hideobject_at @ 0x59
.4byte ScrCmd_faceplayer .4byte ScrCmd_faceplayer @ 0x5a
.4byte ScrCmd_turnobject .4byte ScrCmd_turnobject @ 0x5b
.4byte ScrCmd_trainerbattle .4byte ScrCmd_trainerbattle @ 0x5c
.4byte ScrCmd_dotrainerbattle .4byte ScrCmd_dotrainerbattle @ 0x5d
.4byte ScrCmd_gotopostbattlescript .4byte ScrCmd_gotopostbattlescript @ 0x5e
.4byte ScrCmd_gotobeatenscript .4byte ScrCmd_gotobeatenscript @ 0x5f
.4byte ScrCmd_checktrainerflag .4byte ScrCmd_checktrainerflag @ 0x60
.4byte ScrCmd_settrainerflag .4byte ScrCmd_settrainerflag @ 0x61
.4byte ScrCmd_cleartrainerflag .4byte ScrCmd_cleartrainerflag @ 0x62
.4byte ScrCmd_setobjectxyperm .4byte ScrCmd_setobjectxyperm @ 0x63
.4byte ScrCmd_copyobjectxytoperm .4byte ScrCmd_copyobjectxytoperm @ 0x64
.4byte ScrCmd_setobjectmovementtype .4byte ScrCmd_setobjectmovementtype @ 0x65
.4byte ScrCmd_waitmessage .4byte ScrCmd_waitmessage @ 0x66
.4byte ScrCmd_message .4byte ScrCmd_message @ 0x67
.4byte ScrCmd_closemessage .4byte ScrCmd_closemessage @ 0x68
.4byte ScrCmd_lockall .4byte ScrCmd_lockall @ 0x69
.4byte ScrCmd_lock .4byte ScrCmd_lock @ 0x6a
.4byte ScrCmd_releaseall .4byte ScrCmd_releaseall @ 0x6b
.4byte ScrCmd_release .4byte ScrCmd_release @ 0x6c
.4byte ScrCmd_waitbuttonpress .4byte ScrCmd_waitbuttonpress @ 0x6d
.4byte ScrCmd_yesnobox .4byte ScrCmd_yesnobox @ 0x6e
.4byte ScrCmd_multichoice .4byte ScrCmd_multichoice @ 0x6f
.4byte ScrCmd_multichoicedefault .4byte ScrCmd_multichoicedefault @ 0x70
.4byte ScrCmd_multichoicegrid .4byte ScrCmd_multichoicegrid @ 0x71
.4byte ScrCmd_drawbox .4byte ScrCmd_drawbox @ 0x72
.4byte ScrCmd_erasebox .4byte ScrCmd_erasebox @ 0x73
.4byte ScrCmd_drawboxtext .4byte ScrCmd_drawboxtext @ 0x74
.4byte ScrCmd_showmonpic .4byte ScrCmd_showmonpic @ 0x75
.4byte ScrCmd_hidemonpic .4byte ScrCmd_hidemonpic @ 0x76
.4byte ScrCmd_showcontestwinner .4byte ScrCmd_showcontestwinner @ 0x77
.4byte ScrCmd_braillemessage .4byte ScrCmd_braillemessage @ 0x78
.4byte ScrCmd_givemon .4byte ScrCmd_givemon @ 0x79
.4byte ScrCmd_giveegg .4byte ScrCmd_giveegg @ 0x7a
.4byte ScrCmd_setmonmove .4byte ScrCmd_setmonmove @ 0x7b
.4byte ScrCmd_checkpartymove .4byte ScrCmd_checkpartymove @ 0x7c
.4byte ScrCmd_bufferspeciesname .4byte ScrCmd_bufferspeciesname @ 0x7d
.4byte ScrCmd_bufferleadmonspeciesname .4byte ScrCmd_bufferleadmonspeciesname @ 0x7e
.4byte ScrCmd_bufferpartymonnick .4byte ScrCmd_bufferpartymonnick @ 0x7f
.4byte ScrCmd_bufferitemname .4byte ScrCmd_bufferitemname @ 0x80
.4byte ScrCmd_bufferdecorationname .4byte ScrCmd_bufferdecorationname @ 0x81
.4byte ScrCmd_buffermovename .4byte ScrCmd_buffermovename @ 0x82
.4byte ScrCmd_buffernumberstring .4byte ScrCmd_buffernumberstring @ 0x83
.4byte ScrCmd_bufferstdstring .4byte ScrCmd_bufferstdstring @ 0x84
.4byte ScrCmd_bufferstring .4byte ScrCmd_bufferstring @ 0x85
.4byte ScrCmd_pokemart .4byte ScrCmd_pokemart @ 0x86
.4byte ScrCmd_pokemartdecoration .4byte ScrCmd_pokemartdecoration @ 0x87
.4byte ScrCmd_pokemartdecoration2 .4byte ScrCmd_pokemartdecoration2 @ 0x88
.4byte ScrCmd_playslotmachine .4byte ScrCmd_playslotmachine @ 0x89
.4byte ScrCmd_setberrytree .4byte ScrCmd_setberrytree @ 0x8a
.4byte ScrCmd_choosecontestmon .4byte ScrCmd_choosecontestmon @ 0x8b
.4byte ScrCmd_startcontest .4byte ScrCmd_startcontest @ 0x8c
.4byte ScrCmd_showcontestresults .4byte ScrCmd_showcontestresults @ 0x8d
.4byte ScrCmd_contestlinktransfer .4byte ScrCmd_contestlinktransfer @ 0x8e
.4byte ScrCmd_random .4byte ScrCmd_random @ 0x8f
.4byte ScrCmd_addmoney .4byte ScrCmd_addmoney @ 0x90
.4byte ScrCmd_removemoney .4byte ScrCmd_removemoney @ 0x91
.4byte ScrCmd_checkmoney .4byte ScrCmd_checkmoney @ 0x92
.4byte ScrCmd_showmoneybox .4byte ScrCmd_showmoneybox @ 0x93
.4byte ScrCmd_hidemoneybox .4byte ScrCmd_hidemoneybox @ 0x94
.4byte ScrCmd_updatemoneybox .4byte ScrCmd_updatemoneybox @ 0x95
.4byte ScrCmd_getpricereduction .4byte ScrCmd_getpricereduction @ 0x96
.4byte ScrCmd_fadescreen .4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreenspeed .4byte ScrCmd_fadescreenspeed @ 0x98
.4byte ScrCmd_setflashradius .4byte ScrCmd_setflashradius @ 0x99
.4byte ScrCmd_animateflash .4byte ScrCmd_animateflash @ 0x9a
.4byte ScrCmd_messageautoscroll .4byte ScrCmd_messageautoscroll @ 0x9b
.4byte ScrCmd_dofieldeffect .4byte ScrCmd_dofieldeffect @ 0x9c
.4byte ScrCmd_setfieldeffectarg .4byte ScrCmd_setfieldeffectarg @ 0x9d
.4byte ScrCmd_waitfieldeffect .4byte ScrCmd_waitfieldeffect @ 0x9e
.4byte ScrCmd_setrespawn .4byte ScrCmd_setrespawn @ 0x9f
.4byte ScrCmd_checkplayergender .4byte ScrCmd_checkplayergender @ 0xa0
.4byte ScrCmd_playmoncry .4byte ScrCmd_playmoncry @ 0xa1
.4byte ScrCmd_setmetatile .4byte ScrCmd_setmetatile @ 0xa2
.4byte ScrCmd_resetweather .4byte ScrCmd_resetweather @ 0xa3
.4byte ScrCmd_setweather .4byte ScrCmd_setweather @ 0xa4
.4byte ScrCmd_doweather .4byte ScrCmd_doweather @ 0xa5
.4byte ScrCmd_setstepcallback .4byte ScrCmd_setstepcallback @ 0xa6
.4byte ScrCmd_setmaplayoutindex .4byte ScrCmd_setmaplayoutindex @ 0xa7
.4byte ScrCmd_setobjectpriority .4byte ScrCmd_setobjectpriority @ 0xa8
.4byte ScrCmd_resetobjectpriority .4byte ScrCmd_resetobjectpriority @ 0xa9
.4byte ScrCmd_createvobject .4byte ScrCmd_createvobject @ 0xaa
.4byte ScrCmd_turnvobject .4byte ScrCmd_turnvobject @ 0xab
.4byte ScrCmd_opendoor .4byte ScrCmd_opendoor @ 0xac
.4byte ScrCmd_closedoor .4byte ScrCmd_closedoor @ 0xad
.4byte ScrCmd_waitdooranim .4byte ScrCmd_waitdooranim @ 0xae
.4byte ScrCmd_setdooropen .4byte ScrCmd_setdooropen @ 0xaf
.4byte ScrCmd_setdoorclosed .4byte ScrCmd_setdoorclosed @ 0xb0
.4byte ScrCmd_addelevmenuitem .4byte ScrCmd_addelevmenuitem @ 0xb1
.4byte ScrCmd_showelevmenu .4byte ScrCmd_showelevmenu @ 0xb2
.4byte ScrCmd_checkcoins .4byte ScrCmd_checkcoins @ 0xb3
.4byte ScrCmd_addcoins .4byte ScrCmd_addcoins @ 0xb4
.4byte ScrCmd_removecoins .4byte ScrCmd_removecoins @ 0xb5
.4byte ScrCmd_setwildbattle .4byte ScrCmd_setwildbattle @ 0xb6
.4byte ScrCmd_dowildbattle .4byte ScrCmd_dowildbattle @ 0xb7
.4byte ScrCmd_setvaddress .4byte ScrCmd_setvaddress @ 0xb8
.4byte ScrCmd_vgoto .4byte ScrCmd_vgoto @ 0xb9
.4byte ScrCmd_vcall .4byte ScrCmd_vcall @ 0xba
.4byte ScrCmd_vgoto_if .4byte ScrCmd_vgoto_if @ 0xbb
.4byte ScrCmd_vcall_if .4byte ScrCmd_vcall_if @ 0xbc
.4byte ScrCmd_vmessage .4byte ScrCmd_vmessage @ 0xbd
.4byte ScrCmd_vloadword .4byte ScrCmd_vloadword @ 0xbe
.4byte ScrCmd_vbufferstring .4byte ScrCmd_vbufferstring @ 0xbf
.4byte ScrCmd_showcoinsbox .4byte ScrCmd_showcoinsbox @ 0xc0
.4byte ScrCmd_hidecoinsbox .4byte ScrCmd_hidecoinsbox @ 0xc1
.4byte ScrCmd_updatecoinsbox .4byte ScrCmd_updatecoinsbox @ 0xc2
.4byte ScrCmd_incrementgamestat .4byte ScrCmd_incrementgamestat @ 0xc3
.4byte ScrCmd_setescapewarp .4byte ScrCmd_setescapewarp @ 0xc4
.4byte ScrCmd_waitmoncry .4byte ScrCmd_waitmoncry @ 0xc5
.4byte ScrCmd_bufferboxname .4byte ScrCmd_bufferboxname @ 0xc6
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xc7
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xc8
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xc9
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xca
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xcb
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xcc
.4byte ScrCmd_setmonobedient .4byte ScrCmd_setmonobedient @ 0xcd
.4byte ScrCmd_checkmonobedience .4byte ScrCmd_checkmonobedience @ 0xce
.4byte ScrCmd_gotoram .4byte ScrCmd_gotoram @ 0xcf
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1 @ 0xd0
.4byte ScrCmd_warpD1 .4byte ScrCmd_warpD1 @ 0xd1
.4byte ScrCmd_setmonmetlocation .4byte ScrCmd_setmonmetlocation @ 0xd2
.4byte ScrCmd_moverotatingtileobjects .4byte ScrCmd_moverotatingtileobjects @ 0xd3
.4byte ScrCmd_turnrotatingtileobjects .4byte ScrCmd_turnrotatingtileobjects @ 0xd4
.4byte ScrCmd_initrotatingtilepuzzle .4byte ScrCmd_initrotatingtilepuzzle @ 0xd5
.4byte ScrCmd_freerotatingtilepuzzle .4byte ScrCmd_freerotatingtilepuzzle @ 0xd6
.4byte ScrCmd_warpmossdeepgym .4byte ScrCmd_warpmossdeepgym @ 0xd7
.4byte ScrCmd_cmdD8 .4byte ScrCmd_cmdD8 @ 0xd8
.4byte ScrCmd_cmdD9 .4byte ScrCmd_cmdD9 @ 0xd9
.4byte ScrCmd_closebraillemessage .4byte ScrCmd_closebraillemessage @ 0xda
.4byte ScrCmd_cmdDB .4byte ScrCmd_cmdDB @ 0xdb
.4byte ScrCmd_fadescreenswapbuffers .4byte ScrCmd_fadescreenswapbuffers @ 0xdc
.4byte ScrCmd_buffertrainerclassname .4byte ScrCmd_buffertrainerclassname @ 0xdd
.4byte ScrCmd_buffertrainername .4byte ScrCmd_buffertrainername @ 0xde
.4byte ScrCmd_pokenavcall .4byte ScrCmd_pokenavcall @ 0xdf
.4byte ScrCmd_warpsootopolislegend .4byte ScrCmd_warpsootopolislegend @ 0xe0
.4byte ScrCmd_buffercontesttype .4byte ScrCmd_buffercontesttype @ 0xe1
.4byte ScrCmd_bufferitemnameplural .4byte ScrCmd_bufferitemnameplural @ 0xe2
gScriptCmdTableEnd:: @ 81DBA08 gScriptCmdTableEnd:: @ 81DBA08
.4byte ScrCmd_nop .4byte ScrCmd_nop
data/scripts/item_ball_scripts.inc
+1 -1
View File
@@ -398,7 +398,7 @@ MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
finditem ITEM_TM02 finditem ITEM_TM02
end end
NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC NewMauville_Inside_EventScript_ItemUltraBall:: @ 82911EC
finditem ITEM_ULTRA_BALL finditem ITEM_ULTRA_BALL
end end
data/scripts/new_game.inc
+31
View File
@@ -1,43 +1,66 @@
EventScript_ResetAllBerries:: @ 827149D EventScript_ResetAllBerries:: @ 827149D
@ Route 102
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@ Route 104
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 116
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
@ Route 115
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
@ Route 103
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
@ Route 110
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 117
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
@ Route 112
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Route 111
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
@ Route 114
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
@ Route 118
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
@ Route 119
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
@@ -45,6 +68,8 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 120
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
@@ -55,12 +80,16 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
@ Route 121
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 123
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
@@ -78,6 +107,8 @@ EventScript_ResetAllBerries:: @ 827149D
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Mirage Island
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
return return
data/scripts/secret_base.inc
+1 -1
View File
@@ -308,7 +308,7 @@ SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39
compare VAR_0x8005, 0 compare VAR_0x8005, 0
goto_if_eq SecretBase_EventScript_PutAwayDecorationLoop goto_if_eq SecretBase_EventScript_PutAwayDecorationLoop
removeobject VAR_0x8006 removeobject VAR_0x8006
setflag VAR_0x8005 @ UB: GF likely meant setvar here; setflag 0x8005 is out of bounds setflag VAR_0x8005 @ UB: VAR_0x8005 is set to a flag by PutAwayDecorationIteration, but ScrCmd_setflag doesn't use VarGet
goto SecretBase_EventScript_PutAwayDecorationLoop goto SecretBase_EventScript_PutAwayDecorationLoop
end end
docs/bugs_and_glitches.md
+20
View File
@@ -42,6 +42,26 @@ And edit `AgbMain`:
... ...
``` ```
This restores the code of Ruby/Sapphire.
**Alternate Fix:** Edit the following function in [src/title_screen.c](https://github.com/pret/pokeemerald/blob/master/src/title_screen.c):
```diff
void CB2_InitTitleScreen(void)
{
switch (gMain.state)
{
default:
case 0:
SetVBlankCallback(NULL);
+ StartTimer1();
SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 0);
...
```
This matches with the code of FR/LG and does what GF originally wanted to do.
## Scrolling through items in the bag causes the image to flicker ## Scrolling through items in the bag causes the image to flicker
**Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c): **Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c):
gflib/blit.c
+3 -3
View File
@@ -76,7 +76,7 @@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 hei
s32 yEnd; s32 yEnd;
s32 multiplierY; s32 multiplierY;
s32 loopX, loopY; s32 loopX, loopY;
s32 toOrr1, toOrr2; u8 toOrr1, toOrr2;
xEnd = x + width; xEnd = x + width;
if (xEnd > surface->width) if (xEnd > surface->width)
@@ -87,8 +87,8 @@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 hei
yEnd = surface->height; yEnd = surface->height;
multiplierY = (surface->width + (surface->width & 7)) >> 3; multiplierY = (surface->width + (surface->width & 7)) >> 3;
toOrr1 = (u32)(fillValue << 0x1C) >> 0x18; toOrr1 = fillValue << 4;
toOrr2 = (fillValue & 0xF); toOrr2 = fillValue & 0xF;
for (loopY = y; loopY < yEnd; loopY++) for (loopY = y; loopY < yEnd; loopY++)
{ {
graphics/picture_frame/frame5_map.bin.rl.bak
BIN
View File
Binary file not shown.
graphics/pokenav/bg.bin → graphics/pokenav/bg_dots.bin
View File
graphics/pokenav/bg.png → graphics/pokenav/bg_dots.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 141 B

graphics/pokenav/outline.png → graphics/pokenav/device_outline.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 596 B

After

Width:  |  Height:  |  Size: 596 B

graphics/pokenav/outline_map.bin → graphics/pokenav/device_outline_map.bin
View File
graphics_file_rules.mk
+1 -1
View File
@@ -709,7 +709,7 @@ $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53 $(GFX) $< $@ -num_tiles 53
$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png $(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53 $(GFX) $< $@ -num_tiles 53
$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png $(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
include/battle.h
+1 -1
View File
@@ -493,7 +493,7 @@ struct BattleScripting
u8 field_20; u8 field_20;
u8 reshowMainState; u8 reshowMainState;
u8 reshowHelperState; u8 reshowHelperState;
u8 field_23; u8 levelUpHP;
u8 windowsType; // 0 - normal, 1 - battle arena u8 windowsType; // 0 - normal, 1 - battle arena
u8 multiplayerId; u8 multiplayerId;
u8 specialTrainerBattleType; u8 specialTrainerBattleType;
include/battle_tower.h
+3 -1
View File
@@ -43,7 +43,9 @@ extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const struct FacilityMon gSlateportBattleTentMons[]; extern const struct FacilityMon gSlateportBattleTentMons[];
extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[];
extern u16 gUnknown_03006298[]; // Temporary storage for monIds of the opponent team
// during team generation in battle factory and similar facilities.
extern u16 gFrontierTempParty[];
extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct BattleFrontierTrainer *gFacilityTrainers;
extern const struct FacilityMon *gFacilityTrainerMons; extern const struct FacilityMon *gFacilityTrainerMons;
include/constants/item_effects.h
+5
View File
@@ -51,6 +51,11 @@
// fields 6 and onwards are item-specific arguments // fields 6 and onwards are item-specific arguments
// Special HP recovery amounts for ITEM4_HEAL_HP
#define ITEM6_HEAL_FULL ((u8) -1)
#define ITEM6_HEAL_HALF ((u8) -2)
#define ITEM6_HEAL_LVL_UP ((u8) -3)
// Used for GetItemEffectType. // Used for GetItemEffectType.
#define ITEM_EFFECT_X_ITEM 0 #define ITEM_EFFECT_X_ITEM 0
#define ITEM_EFFECT_RAISE_LEVEL 1 #define ITEM_EFFECT_RAISE_LEVEL 1
include/constants/items.h
+4
View File
@@ -497,6 +497,10 @@
#define MAX_PC_ITEM_CAPACITY 999 #define MAX_PC_ITEM_CAPACITY 999
#define MAX_BERRY_CAPACITY 999 #define MAX_BERRY_CAPACITY 999
#define BAG_ITEM_CAPACITY_DIGITS 2
#define BERRY_CAPACITY_DIGITS 3
#define MAX_ITEM_DIGITS BERRY_CAPACITY_DIGITS
// Secondary IDs for rods // Secondary IDs for rods
#define OLD_ROD 0 #define OLD_ROD 0
#define GOOD_ROD 1 #define GOOD_ROD 1
include/constants/pokemon.h
+22 -22
View File
@@ -239,12 +239,12 @@
#define UNOWN_FORM_COUNT 28 #define UNOWN_FORM_COUNT 28
// Battle move flags // Battle move flags
#define FLAG_MAKES_CONTACT 0x1 #define FLAG_MAKES_CONTACT (1 << 0)
#define FLAG_PROTECT_AFFECTED 0x2 #define FLAG_PROTECT_AFFECTED (1 << 1)
#define FLAG_MAGICCOAT_AFFECTED 0x4 #define FLAG_MAGICCOAT_AFFECTED (1 << 2)
#define FLAG_SNATCH_AFFECTED 0x8 #define FLAG_SNATCH_AFFECTED (1 << 3)
#define FLAG_MIRROR_MOVE_AFFECTED 0x10 #define FLAG_MIRROR_MOVE_AFFECTED (1 << 4)
#define FLAG_KINGSROCK_AFFECTED 0x20 #define FLAG_KINGSROCK_AFFECTED (1 << 5)
// Growth rates // Growth rates
#define GROWTH_MEDIUM_FAST 0 #define GROWTH_MEDIUM_FAST 0
@@ -268,22 +268,22 @@
#define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80 #define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80
// Evolution type flags // Evolution types
#define EVO_FRIENDSHIP 0x0001 // Pokémon levels up with friendship ≥ 220 #define EVO_FRIENDSHIP 1 // Pokémon levels up with friendship ≥ 220
#define EVO_FRIENDSHIP_DAY 0x0002 // Pokémon levels up during the day with friendship ≥ 220 #define EVO_FRIENDSHIP_DAY 2 // Pokémon levels up during the day with friendship ≥ 220
#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220 #define EVO_FRIENDSHIP_NIGHT 3 // Pokémon levels up at night with friendship ≥ 220
#define EVO_LEVEL 0x0004 // Pokémon reaches the specified level #define EVO_LEVEL 4 // Pokémon reaches the specified level
#define EVO_TRADE 0x0005 // Pokémon is traded #define EVO_TRADE 5 // Pokémon is traded
#define EVO_TRADE_ITEM 0x0006 // Pokémon is traded while it's holding the specified item #define EVO_TRADE_ITEM 6 // Pokémon is traded while it's holding the specified item
#define EVO_ITEM 0x0007 // specified item is used on Pokémon #define EVO_ITEM 7 // specified item is used on Pokémon
#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense #define EVO_LEVEL_ATK_GT_DEF 8 // Pokémon reaches the specified level with attack > defense
#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense #define EVO_LEVEL_ATK_EQ_DEF 9 // Pokémon reaches the specified level with attack = defense
#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense #define EVO_LEVEL_ATK_LT_DEF 10 // Pokémon reaches the specified level with attack < defense
#define EVO_LEVEL_SILCOON 0x000b // Pokémon reaches the specified level with a Silcoon personality value #define EVO_LEVEL_SILCOON 11 // Pokémon reaches the specified level with a Silcoon personality value
#define EVO_LEVEL_CASCOON 0x000c // Pokémon reaches the specified level with a Cascoon personality value #define EVO_LEVEL_CASCOON 12 // Pokémon reaches the specified level with a Cascoon personality value
#define EVO_LEVEL_NINJASK 0x000d // Pokémon reaches the specified level (special value for Ninjask) #define EVO_LEVEL_NINJASK 13 // Pokémon reaches the specified level (special value for Ninjask)
#define EVO_LEVEL_SHEDINJA 0x000e // Pokémon reaches the specified level (special value for Shedinja) #define EVO_LEVEL_SHEDINJA 14 // Pokémon reaches the specified level (special value for Shedinja)
#define EVO_BEAUTY 0x000f // Pokémon levels up with beauty ≥ specified value #define EVO_BEAUTY 15 // Pokémon levels up with beauty ≥ specified value
#define EVOS_PER_MON 5 #define EVOS_PER_MON 5
include/data.h
-1
View File
@@ -2,7 +2,6 @@
#define GUARD_DATA_H #define GUARD_DATA_H
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/species.h"
#define SPECIES_SHINY_TAG 500 #define SPECIES_SHINY_TAG 500
include/global.h
+2 -3
View File
@@ -8,6 +8,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/species.h"
// Prevent cross-jump optimization. // Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm(""); #define BLOCK_CROSS_JUMP asm("");
@@ -65,8 +66,6 @@
// Converts a Q24.8 fixed-point format number to a regular integer // Converts a Q24.8 fixed-point format number to a regular integer
#define Q_24_8_TO_INT(n) ((int)((n) >> 8)) #define Q_24_8_TO_INT(n) ((int)((n) >> 8))
#define POKEMON_SLOTS_NUMBER 412
#define min(a, b) ((a) < (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b))
@@ -115,7 +114,7 @@
#define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER)) #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES))
#define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT)) #define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT))
struct Coords8 struct Coords8
include/menu_specialized.h
+6 -6
View File
@@ -23,7 +23,7 @@ struct UnknownSubStruct_81D1ED4
struct ConditionGraph struct ConditionGraph
{ {
/*0x000*/ u8 unk0[4][FLAVOR_COUNT]; /*0x000*/ u8 stat[4][FLAVOR_COUNT];
/*0x014*/ struct UnknownSubStruct_81D1ED4 unk14[4][FLAVOR_COUNT]; /*0x014*/ struct UnknownSubStruct_81D1ED4 unk14[4][FLAVOR_COUNT];
/*0x064*/ struct UnknownSubStruct_81D1ED4 unk64[10][FLAVOR_COUNT]; /*0x064*/ struct UnknownSubStruct_81D1ED4 unk64[10][FLAVOR_COUNT];
/*0x12C*/ struct UnknownSubStruct_81D1ED4 unk12C[FLAVOR_COUNT]; /*0x12C*/ struct UnknownSubStruct_81D1ED4 unk12C[FLAVOR_COUNT];
@@ -32,7 +32,7 @@ struct ConditionGraph
/*0x350*/ u16 unk350; /*0x350*/ u16 unk350;
/*0x352*/ u16 unk352; /*0x352*/ u16 unk352;
/*0x354*/ u8 unk354; /*0x354*/ u8 unk354;
/*0x355*/ u8 unk355; /*0x355*/ u8 state;
}; };
bool8 sub_81D1C44(u8 count); bool8 sub_81D1C44(u8 count);
@@ -41,12 +41,12 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page);
void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1E90(struct PlayerPCItemPageStruct *page);
void sub_81D1EC0(void); void sub_81D1EC0(void);
void sub_81D1D04(u8 a0); void sub_81D1D04(u8 a0);
void sub_81D1ED4(struct ConditionGraph *graph); void InitConditionGraphData(struct ConditionGraph *graph);
void sub_81D2108(struct ConditionGraph *graph); void sub_81D2108(struct ConditionGraph *graph);
void sub_81D21DC(u8 bg); void SetConditionGraphIOWindows(u8 bg);
void sub_81D20AC(struct ConditionGraph *graph); void InitConditionGraphState(struct ConditionGraph *graph);
void sub_81D2230(struct ConditionGraph *graph); void sub_81D2230(struct ConditionGraph *graph);
bool8 sub_81D20BC(struct ConditionGraph *graph); bool8 SetupConditionGraphScanlineParams(struct ConditionGraph *graph);
bool32 TransitionConditionGraph(struct ConditionGraph *graph); bool32 TransitionConditionGraph(struct ConditionGraph *graph);
void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
void sub_81D1F84(struct ConditionGraph *graph, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void sub_81D1F84(struct ConditionGraph *graph, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2);
include/mon_markings.h
+2 -2
View File
@@ -29,8 +29,8 @@ bool8 sub_811F960(void);
void sub_811FA90(void); void sub_811FA90(void);
void sub_811FAA4(u8 markings, s16 x, s16 y); void sub_811FAA4(u8 markings, s16 x, s16 y);
void sub_811FAF8(void); void sub_811FAF8(void);
bool8 sub_811FBA4(void); bool8 MonMarkingsMenuHandleInput(void);
struct Sprite *sub_811FF94(u16 tileTag, u16 paletteTag, const u16 *palette); struct Sprite *CreateMonMarkingsSpriteWithPal(u16 tileTag, u16 paletteTag, const u16 *palette);
struct Sprite *sub_811FFB4(u16 tileTag, u16 paletteTag, const u16 *palette); struct Sprite *sub_811FFB4(u16 tileTag, u16 paletteTag, const u16 *palette);
void sub_8120084(u8 markings, void *dest); void sub_8120084(u8 markings, void *dest);
include/pokenav.h
+118 -80
View File
@@ -27,17 +27,17 @@ struct PokenavListTemplate
struct PokenavMonList *monList; struct PokenavMonList *monList;
struct PokenavMatchCallEntries *matchCallEntries; struct PokenavMatchCallEntries *matchCallEntries;
} list; } list;
u16 unk4; u16 count;
u16 unk6; u16 unk6;
u8 unk8; u8 unk8;
u8 unk9; u8 item_X;
u8 unkA; u8 windowWidth;
u8 unkB; u8 listTop;
u8 unkC; u8 maxShowed;
u8 unkD; u8 fillValue;
u8 unkE; u8 fontId;
union { union {
void (*unk10_1)(struct PokenavMonList *, u8 *a1); void (*printMonFunc)(struct PokenavMonList *item, u8 *dest);
void (*unk10_2)(struct PokenavMatchCallEntries *, u8 *a1); void (*unk10_2)(struct PokenavMatchCallEntries *, u8 *a1);
} listFunc; } listFunc;
void (*unk14)(u16 a0, u32 a1, u32 a2); void (*unk14)(u16 a0, u32 a1, u32 a2);
@@ -45,9 +45,9 @@ struct PokenavListTemplate
struct PokenavSub18 struct PokenavSub18
{ {
u16 unk0; u16 listCount;
u16 unk2; u16 currIndex;
struct PokenavMonList unk4[TOTAL_BOXES_COUNT * IN_BOX_COUNT + PARTY_SIZE]; struct PokenavMonList monData[TOTAL_BOXES_COUNT * IN_BOX_COUNT + PARTY_SIZE];
}; };
// Return values of LoopedTask functions. // Return values of LoopedTask functions.
@@ -65,6 +65,31 @@ enum
POKENAV_MODE_FORCE_CALL_EXIT, // Pokenav tutorial after calling Mr. Stone POKENAV_MODE_FORCE_CALL_EXIT, // Pokenav tutorial after calling Mr. Stone
}; };
// TODO - refine these names
enum Substructures
{
POKENAV_SUBSTRUCT_MAIN_MENU,
POKENAV_SUBSTRUCT_MAIN_MENU_HANDLER,
POKENAV_SUBSTRUCT_MENU_ICONS,
POKENAV_SUBSTRUCT_REGION_MAP_STATE,
POKENAV_SUBSTRUCT_REGION_MAP_ZOOM,
POKENAV_SUBSTRUCT_MATCH_CALL_MAIN,
POKENAV_SUBSTRUCT_MATCH_CALL_OPEN,
POKENAV_SUBSTRUCT_CONDITION_SEARCH_RESULTS,
POKENAV_SUBSTRUCT_CONDITION_SEARCH_RESULT_LIST,
POKENAV_SUBSTRUCT_RIBBONS_MON_LIST,
POKENAV_SUBSTRUCT_RIBBONS_MON_MENU,
POKENAV_SUBSTRUCT_CONDITION_GRAPH,
POKENAV_SUBSTRUCT_MON_MARK_MENU,
POKENAV_SUBSTRUCT_RIBBONS_SUMMARY_LIST,
POKENAV_SUBSTRUCT_RIBBONS_SUMMARY_MENU,
POKENAV_SUBSTRUCT_15, //unused
POKENAV_SUBSTRUCT_REGION_MAP,
POKENAV_SUBSTRUCT_MATCH_CALL_LIST,
POKENAV_SUBSTRUCT_MON_LIST,
POKENAV_SUBSTRUCT_COUNT,
};
enum enum
{ {
POKENAV_GFX_MAIN_MENU, POKENAV_GFX_MAIN_MENU,
@@ -97,12 +122,12 @@ enum
POKENAV_REGION_MAP, POKENAV_REGION_MAP,
POKENAV_CONDITION_PARTY, POKENAV_CONDITION_PARTY,
POKENAV_CONDITION_SEARCH_RESULTS, POKENAV_CONDITION_SEARCH_RESULTS,
POKENAV_MENU_9, // Condition POKENAV_CONDITION_GRAPH_FROM_SEARCH, // opening condition graph from search list
POKENAV_MENU_A, // Condition POKENAV_RETURN_CONDITION_SEARCH, //return to search list from condition graph
POKENAV_MATCH_CALL, POKENAV_MATCH_CALL,
POKENAV_RIBBONS_MON_LIST, POKENAV_RIBBONS_MON_LIST,
POKENAV_MENU_D, // Ribbons POKENAV_RIBBONS_SUMMARY_SCREEN,
POKENAV_MENU_E, // Ribbons POKENAV_RIBBONS_RETURN_TO_MON_LIST,
}; };
enum enum
@@ -207,7 +232,7 @@ enum
// Pokenav Function IDs // Pokenav Function IDs
// Indices into the LoopedTask tables for each of the main Pokenav features // Indices into the LoopedTask tables for each of the main Pokenav features
enum enum RegionMapFuncIds
{ {
POKENAV_MENU_FUNC_NONE, POKENAV_MENU_FUNC_NONE,
POKENAV_MENU_FUNC_MOVE_CURSOR, POKENAV_MENU_FUNC_MOVE_CURSOR,
@@ -220,6 +245,19 @@ enum
POKENAV_MENU_FUNC_OPEN_FEATURE, POKENAV_MENU_FUNC_OPEN_FEATURE,
}; };
enum PartyConditionFuncIds
{
PARTY_CONDITION_FUNC_NONE,
PARTY_CONDITION_FUNC_SLIDE_MON_IN,
PARTY_CONDITION_FUNC_RETURN,
PARTY_CONDITION_FUNC_NO_TRANSITION,
PARTY_CONDITION_FUNC_SLIDE_MON_OUT,
PARTY_CONDITION_FUNC_ADD_MARKINGS,
PARTY_CONDITION_FUNC_CLOSE_MARKINGS,
};
#define POKENAV_MENU_FUNC_EXIT -1
enum enum
{ {
POKENAV_MC_FUNC_NONE, POKENAV_MC_FUNC_NONE,
@@ -268,17 +306,17 @@ void SetPokenavVBlankCallback(void);
void SetVBlankCallback_(IntrCallback callback); void SetVBlankCallback_(IntrCallback callback);
// pokenav_match_call_ui.c // pokenav_match_call_ui.c
u32 GetSelectedMatchCall(void); u32 GetSelectedPokenavListIndex(void);
bool32 sub_81C8224(void); bool32 sub_81C8224(void);
int MatchCall_MoveCursorUp(void); int MatchCall_MoveCursorUp(void);
int MatchCall_MoveCursorDown(void); int MatchCall_MoveCursorDown(void);
int MatchCall_PageDown(void); int MatchCall_PageDown(void);
int MatchCall_PageUp(void); int MatchCall_PageUp(void);
bool32 sub_81C8630(void); bool32 IsMonListLoopedTaskActive(void);
void ToggleMatchCallVerticalArrows(bool32 shouldHide); void ToggleMatchCallVerticalArrows(bool32 shouldHide);
void sub_81C8838(void); void sub_81C8838(void);
void sub_81C877C(void); void sub_81C877C(void);
bool32 sub_81C8820(void); bool32 IsMatchCallListTaskActive(void);
void PrintCheckPageInfo(s16 a0); void PrintCheckPageInfo(s16 a0);
u32 GetMatchCallListTopIndex(void); u32 GetMatchCallListTopIndex(void);
void sub_81C87F0(void); void sub_81C87F0(void);
@@ -300,30 +338,30 @@ void MatchCall_GetNameAndDesc(u32 idx, const u8 **desc, const u8 **name);
// pokenav_main_menu.c // pokenav_main_menu.c
bool32 InitPokenavMainMenu(void); bool32 InitPokenavMainMenu(void);
void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size); void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size);
void sub_81C7850(u32 a0); void RunMainMenuLoopedTask(u32 a0);
u32 sub_81C786C(void); u32 IsActiveMenuLoopTaskActive(void);
void LoadLeftHeaderGfxForIndex(u32 arg0); void LoadLeftHeaderGfxForIndex(u32 arg0);
void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2); void ShowLeftHeaderGfx(u32 menugfxId, bool32 arg1, bool32 isOnRightSide);
void PokenavFadeScreen(s32 fadeType); void PokenavFadeScreen(s32 fadeType);
bool32 sub_81C8010(void); bool32 AreLeftHeaderSpritesMoving(void);
void InitBgTemplates(const struct BgTemplate *templates, int count); void InitBgTemplates(const struct BgTemplate *templates, int count);
bool32 IsPaletteFadeActive(void); bool32 IsPaletteFadeActive(void);
void PrintHelpBarText(u32 textId); void PrintHelpBarText(u32 textId);
bool32 WaitForHelpBar(void); bool32 WaitForHelpBar(void);
void sub_81C78A0(void); void SlideMenuHeaderDown(void);
bool32 MainMenuLoopedTaskIsBusy(void); bool32 MainMenuLoopedTaskIsBusy(void);
void sub_81C7FDC(void); void SetLeftHeaderSpritesInvisibility(void);
void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette); void PokenavCopyPalette(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette);
void sub_81C7B40(void); void sub_81C7B40(void);
struct Sprite *PauseSpinningPokenavSprite(void); struct Sprite *PauseSpinningPokenavSprite(void);
void ResumeSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void);
void sub_81C7E14(u32 arg0); void UpdateRegionMapRightHeaderTiles(u32 arg0);
void sub_81C7FC4(u32 arg0, bool32 arg1); void HideMainOrSubMenuLeftHeader(u32 id, bool32 onRightSide);
void sub_81C7880(void); void SlideMenuHeaderUp(void);
void sub_81C7990(u32 a0, u16 a1); void PokenavFillPalette(u32 palIndex, u16 fillValue);
u32 PokenavMainMenuLoopedTaskIsActive(void); u32 PokenavMainMenuLoopedTaskIsActive(void);
bool32 WaitForPokenavShutdownFade(void); bool32 WaitForPokenavShutdownFade(void);
void sub_81C7834(void *func1, void *func2); void SetActiveMenuLoopTasks(void *func1, void *func2);
void ShutdownPokenav(void); void ShutdownPokenav(void);
// pokenav_menu_handler_1.c // pokenav_menu_handler_1.c
@@ -345,7 +383,7 @@ bool32 OpenPokenavMenuNotInitial(void);
void CreateMenuHandlerLoopedTask(s32 ltIdx); void CreateMenuHandlerLoopedTask(s32 ltIdx);
bool32 IsMenuHandlerLoopedTaskActive(void); bool32 IsMenuHandlerLoopedTaskActive(void);
void FreeMenuHandlerSubstruct2(void); void FreeMenuHandlerSubstruct2(void);
void sub_81CAADC(void); void ResetBldCnt_(void);
// pokenav_match_call_1.c // pokenav_match_call_1.c
bool32 PokenavCallback_Init_MatchCall(void); bool32 PokenavCallback_Init_MatchCall(void);
@@ -364,7 +402,7 @@ const u8 *GetMatchCallMessageText(int index, u8 *arg1);
u16 GetMatchCallOptionCursorPos(void); u16 GetMatchCallOptionCursorPos(void);
u16 GetMatchCallOptionId(int arg0); u16 GetMatchCallOptionId(int arg0);
void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntries * arg0, u8 *str); void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntries * arg0, u8 *str);
u8 sub_81CB0C8(int rematchIndex); u8 GetMatchTableMapSectionId(int rematchIndex);
int GetIndexDeltaOfNextCheckPageDown(int index); int GetIndexDeltaOfNextCheckPageDown(int index);
int GetIndexDeltaOfNextCheckPageUp(int index); int GetIndexDeltaOfNextCheckPageUp(int index);
bool32 IsRematchEntryRegistered(int index); bool32 IsRematchEntryRegistered(int index);
@@ -385,60 +423,60 @@ void FreeRegionMapSubstruct1(void);
void FreeRegionMapSubstruct2(void); void FreeRegionMapSubstruct2(void);
// pokenav_conditions_1.c // pokenav_conditions_1.c
u32 PokenavCallback_Init_7(void); u32 PokenavCallback_Init_PartyCondition(void);
u32 PokenavCallback_Init_9(void); u32 PokenavCallback_Init_ConditionGraphFromSearch(void);
u32 sub_81CD070(void); u32 GetPartyConditionCallback(void);
void sub_81CD1C0(void); void FreePartyConditionSubstruct1(void);
bool32 sub_81CD3C4(void); bool32 LoadPartyConditionMenuGfx(void);
bool32 sub_81CDD5C(void); bool32 IsConditionMenuSearchMode(void);
struct ConditionGraph *sub_81CDC70(void); struct ConditionGraph *GetConditionGraphDataPtr(void);
u16 sub_81CDC60(void); u16 GetConditionGraphCurrentMonIndex(void);
u16 sub_81CDC50(void); u16 GetMonListCount(void);
u8 sub_81CDDB0(void); u8 GetMonSheen(void);
bool32 sub_81CD548(u8 arg0); bool32 SetConditionGraphData(u8 arg0);
u8 sub_81CDD7C(void); u8 TryGetMonMarkId(void);
u8 *sub_81CDD04(u8 id); u8 *GetConditionMonNameBuffer(u8 id);
u8 *sub_81CDD24(u8 id); u8 *GetConditionMonLocationBuffer(u8 id);
u16 sub_81CDD48(void); u16 GetConditionMonDataBuffer(void);
void *sub_81CDCB4(u8 id); void *GetConditionMonPicGfx(u8 id);
void *sub_81CDCD4(u8 id); void *GetConditionMonPal(u8 id);
// pokenav_conditions_2.c // pokenav_conditions_2.c
bool32 sub_81CDDD4(void); bool32 OpenPartyConditionMenu(void);
void sub_81CDE2C(s32); void CreatePartyConditionLoopedTask(s32);
u32 sub_81CDE64(void); u32 IsPartyConditionLoopedTaskActive(void);
void sub_81CECA0(void); void FreePartyConditionSubstruct2(void);
u8 sub_81CEF14(void); u8 GetMonMarkingsData(void);
// pokenav_conditions_3.c // pokenav_conditions_3.c
u32 PokenavCallback_Init_8(void); u32 PokenavCallback_Init_ConditionSearch(void);
u32 PokenavCallback_Init_10(void); u32 PokenavCallback_Init_ReturnToMonSearchList(void);
u32 sub_81CEFDC(void); u32 GetConditionSearchResultsCallback(void);
void sub_81CEFF0(void); void FreeSearchResultSubstruct1(void);
bool32 sub_81CF330(void); bool32 OpenConditionSearchResults(void);
bool32 sub_81CF368(void); bool32 OpenConditionSearchListFromGraph(void);
void sub_81CF3A0(s32); void CreateSearchResultsLoopedTask(s32);
u32 sub_81CF3D0(void); u32 IsSearchResultLoopedTaskActive(void);
void sub_81CF3F8(void); void FreeSearchResultSubstruct2(void);
// pokenav_ribbons_1.c // pokenav_ribbons_1.c
u32 PokenavCallback_Init_12(void); u32 PokenavCallback_Init_MonRibbonList(void);
u32 PokenavCallback_Init_14(void); u32 PokenavCallback_Init_RibbonsMonListFromSummary(void);
u32 sub_81CFA34(void); u32 GetRibbonsMonListCallback(void);
void sub_81CFA48(void); void FreeRibbonsMonList1(void);
bool32 sub_81CFDD0(void); bool32 OpenRibbonsMonList(void);
bool32 sub_81CFE08(void); bool32 OpenRibbonsMonListFromRibbonsSummary(void);
void sub_81CFE40(s32); void CreateRibbonsMonListLoopedTask(s32);
u32 sub_81CFE70(void); u32 IsRibbonsMonListLoopedTaskActive(void);
void sub_81CFE98(void); void FreeRibbonsMonList2(void);
// pokenav_ribbons_2.c // pokenav_ribbons_2.c
u32 PokenavCallback_Init_13(void); u32 PokenavCallback_Init_RibbonsSummaryMenu(void);
u32 sub_81D04A0(void); u32 GetRibbonsSummaryMenuCallback(void);
void sub_81D04B8(void); void FreeRibbonsSummaryScreen1(void);
bool32 sub_81D0978(void); bool32 OpenRibbonsSummaryMenu(void);
void sub_81D09B0(s32); void CreateRibbonsSummaryLoopedTask(s32);
u32 sub_81D09E0(void); u32 IsRibbonsSummaryLoopedTaskActive(void);
void sub_81D09F4(void); void FreeRibbonsSummaryScreen2(void);
#endif // GUARD_POKENAV_H #endif // GUARD_POKENAV_H
include/trainer_hill.h
+17 -9
View File
@@ -8,10 +8,10 @@ struct TrainerHillTrainer
u8 name[HILL_TRAINER_NAME_LENGTH]; u8 name[HILL_TRAINER_NAME_LENGTH];
u8 facilityClass; u8 facilityClass;
u32 unused; u32 unused;
u16 speechBefore[6]; u16 speechBefore[EASY_CHAT_BATTLE_WORDS_COUNT];
u16 speechWin[6]; u16 speechWin[EASY_CHAT_BATTLE_WORDS_COUNT];
u16 speechLose[6]; u16 speechLose[EASY_CHAT_BATTLE_WORDS_COUNT];
u16 speechAfter[6]; u16 speechAfter[EASY_CHAT_BATTLE_WORDS_COUNT];
struct BattleTowerPokemon mons[PARTY_SIZE]; struct BattleTowerPokemon mons[PARTY_SIZE];
}; };
@@ -23,11 +23,19 @@ struct TrHillRoomTrainers
struct TrHillDisplay struct TrHillDisplay
{ {
u8 data[0x100]; // Metatile data. Add 0x200 to the values in this array to get metatiles.
u16 unk3A0[16]; // This data then overwrites the metatiles in the map starting at (0,5)
u8 coords[2]; // x first 4 bits, y last 4 bits u8 metatileData[0x100];
u8 direction; // array of 4 bits for each trainer // Collision data. One bit for each tile in column-major order,
u8 range; // array of 4 bits for each trainer // so every array entry is one row. 1 = impassable, 0 = passable
u16 collisionData[16];
// Trainer coordinates, starting at (0,6). Format is 0bYYYYXXXX.
u8 coords[2];
// Trainer facing directions. Same as (DIR_* - 1).
// Effectively an array of nibbles, one for each trainer.
u8 direction;
// Trainer sight ranges. Effectively an array of nibbles, one for each trainer.
u8 range;
}; };
struct TrHillFloor struct TrHillFloor
sound/direct_sound_data.inc
+114 -114
View File
@@ -1,26 +1,26 @@
.align 2 .align 2
DirectSoundWaveData_sc88_glockenspiel:: DirectSoundWaveData_sc88pro_glockenspiel::
.incbin "sound/direct_sound_samples/sc88_glockenspiel.bin" .incbin "sound/direct_sound_samples/sc88pro_glockenspiel.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_organ2:: DirectSoundWaveData_sc88pro_organ2::
.incbin "sound/direct_sound_samples/sc88_organ2.bin" .incbin "sound/direct_sound_samples/sc88pro_organ2.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_fretless_bass:: DirectSoundWaveData_sc88pro_fretless_bass::
.incbin "sound/direct_sound_samples/sc88_fretless_bass.bin" .incbin "sound/direct_sound_samples/sc88pro_fretless_bass.bin"
.align 2 .align 2
DirectSoundWaveData_jv1080_slap_bass:: DirectSoundWaveData_sc88pro_slap_bass::
.incbin "sound/direct_sound_samples/jv1080_slap_bass.bin" .incbin "sound/direct_sound_samples/sc88pro_slap_bass.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_synth_bass:: DirectSoundWaveData_sc88pro_synth_bass::
.incbin "sound/direct_sound_samples/sc88_synth_bass.bin" .incbin "sound/direct_sound_samples/sc88pro_synth_bass.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_timpani:: DirectSoundWaveData_sc88pro_timpani::
.incbin "sound/direct_sound_samples/sc88_timpani.bin" .incbin "sound/direct_sound_samples/sc88pro_timpani.bin"
.align 2 .align 2
DirectSoundWaveData_classical_choir_voice_ahhs:: DirectSoundWaveData_classical_choir_voice_ahhs::
@@ -35,44 +35,44 @@ DirectSoundWaveData_unused_sd90_oboe::
.incbin "sound/direct_sound_samples/unused_sd90_oboe.bin" .incbin "sound/direct_sound_samples/unused_sd90_oboe.bin"
.align 2 .align 2
DirectSoundWaveData_unused_electric_guitar:: DirectSoundWaveData_unused_guitar_separates_power_chord::
.incbin "sound/direct_sound_samples/unused_electric_guitar.bin" .incbin "sound/direct_sound_samples/unused_guitar_separates_power_chord.bin"
.align 2 .align 2
DirectSoundWaveData_unused_sc88_unison_slap:: DirectSoundWaveData_unused_sc88pro_unison_slap::
.incbin "sound/direct_sound_samples/unused_sc88_unison_slap.bin" .incbin "sound/direct_sound_samples/unused_sc88pro_unison_slap.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_snare:: DirectSoundWaveData_unknown_snare::
.incbin "sound/direct_sound_samples/unknown_snare.bin" .incbin "sound/direct_sound_samples/unknown_snare.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_wood_block_low:: DirectSoundWaveData_ethnic_flavours_ohtsuzumi::
.incbin "sound/direct_sound_samples/unknown_wood_block_low.bin" .incbin "sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_wood_block_high:: DirectSoundWaveData_ethnic_flavours_hyoushigi::
.incbin "sound/direct_sound_samples/unknown_wood_block_high.bin" .incbin "sound/direct_sound_samples/ethnic_flavours_hyoushigi.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_standard_kick:: DirectSoundWaveData_sc88pro_rnd_kick::
.incbin "sound/direct_sound_samples/sc88_standard_kick.bin" .incbin "sound/direct_sound_samples/sc88pro_rnd_kick.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_standard3_snare:: DirectSoundWaveData_sc88pro_rnd_snare::
.incbin "sound/direct_sound_samples/sc88_standard3_snare.bin" .incbin "sound/direct_sound_samples/sc88pro_rnd_snare.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_standard_hand_clap:: DirectSoundWaveData_sc88pro_tr909_hand_clap::
.incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin" .incbin "sound/direct_sound_samples/sc88pro_tr909_hand_clap.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_orchestra_snare:: DirectSoundWaveData_sc88pro_orchestra_snare::
.incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin" .incbin "sound/direct_sound_samples/sc88pro_orchestra_snare.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_tom:: DirectSoundWaveData_unused_sc55_tom::
.incbin "sound/direct_sound_samples/unknown_tom.bin" .incbin "sound/direct_sound_samples/unused_sc55_tom.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_close_hihat:: DirectSoundWaveData_unknown_close_hihat::
@@ -87,24 +87,24 @@ DirectSoundWaveData_unknown_bell::
.incbin "sound/direct_sound_samples/unknown_bell.bin" .incbin "sound/direct_sound_samples/unknown_bell.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_tambourine:: DirectSoundWaveData_sc88pro_tambourine::
.incbin "sound/direct_sound_samples/unknown_tambourine.bin" .incbin "sound/direct_sound_samples/sc88pro_tambourine.bin"
.align 2 .align 2
DirectSoundWaveData_trinity_cymbal_crash:: DirectSoundWaveData_trinity_cymbal_crash::
.incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin" .incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_orchestra_cymbal_crash:: DirectSoundWaveData_sc88pro_orchestra_cymbal_crash::
.incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin" .incbin "sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_bongo:: DirectSoundWaveData_sc88pro_mute_high_conga::
.incbin "sound/direct_sound_samples/sc88_bongo.bin" .incbin "sound/direct_sound_samples/sc88pro_mute_high_conga.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_bongo_low:: DirectSoundWaveData_sc88pro_open_low_conga::
.incbin "sound/direct_sound_samples/sc88_bongo_low.bin" .incbin "sound/direct_sound_samples/sc88pro_open_low_conga.bin"
.align 2 .align 2
DirectSoundWaveData_drum_and_percussion_kick:: DirectSoundWaveData_drum_and_percussion_kick::
@@ -123,96 +123,96 @@ DirectSoundWaveData_dance_drums_ride_bell::
.incbin "sound/direct_sound_samples/dance_drums_ride_bell.bin" .incbin "sound/direct_sound_samples/dance_drums_ride_bell.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_cowbell:: DirectSoundWaveData_sd90_cowbell::
.incbin "sound/direct_sound_samples/unknown_cowbell.bin" .incbin "sound/direct_sound_samples/sd90_cowbell.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_djembe:: DirectSoundWaveData_unused_heart_of_asia_indian_drum::
.incbin "sound/direct_sound_samples/unknown_djembe.bin" .incbin "sound/direct_sound_samples/unused_heart_of_asia_indian_drum.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_anvil_high:: DirectSoundWaveData_sd90_open_triangle::
.incbin "sound/direct_sound_samples/unknown_anvil_high.bin" .incbin "sound/direct_sound_samples/sd90_open_triangle.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_standard_bells:: DirectSoundWaveData_sc88pro_jingle_bell::
.incbin "sound/direct_sound_samples/sc88_standard_bells.bin" .incbin "sound/direct_sound_samples/sc88pro_jingle_bell.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_anvil_low:: DirectSoundWaveData_ethnic_flavours_atarigane::
.incbin "sound/direct_sound_samples/unknown_anvil_low.bin" .incbin "sound/direct_sound_samples/ethnic_flavours_atarigane.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_ethnic_drum:: DirectSoundWaveData_sc88pro_taiko::
.incbin "sound/direct_sound_samples/unknown_ethnic_drum.bin" .incbin "sound/direct_sound_samples/sc88pro_taiko.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_tsuzumi:: DirectSoundWaveData_ethnic_flavours_kotsuzumi::
.incbin "sound/direct_sound_samples/unknown_tsuzumi.bin" .incbin "sound/direct_sound_samples/ethnic_flavours_kotsuzumi.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_piano1_48:: DirectSoundWaveData_sc88pro_piano1_48::
.incbin "sound/direct_sound_samples/sc88_piano1_48.bin" .incbin "sound/direct_sound_samples/sc88pro_piano1_48.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_piano1_60:: DirectSoundWaveData_sc88pro_piano1_60::
.incbin "sound/direct_sound_samples/sc88_piano1_60.bin" .incbin "sound/direct_sound_samples/sc88pro_piano1_60.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_piano1_72:: DirectSoundWaveData_sc88pro_piano1_72::
.incbin "sound/direct_sound_samples/sc88_piano1_72.bin" .incbin "sound/direct_sound_samples/sc88pro_piano1_72.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_piano1_84:: DirectSoundWaveData_sc88pro_piano1_84::
.incbin "sound/direct_sound_samples/sc88_piano1_84.bin" .incbin "sound/direct_sound_samples/sc88pro_piano1_84.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_string_ensemble_60:: DirectSoundWaveData_sc88pro_string_ensemble_60::
.incbin "sound/direct_sound_samples/sc88_string_ensemble_60.bin" .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_60.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_string_ensemble_72:: DirectSoundWaveData_sc88pro_string_ensemble_72::
.incbin "sound/direct_sound_samples/sc88_string_ensemble_72.bin" .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_72.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_string_ensemble_84:: DirectSoundWaveData_sc88pro_string_ensemble_84::
.incbin "sound/direct_sound_samples/sc88_string_ensemble_84.bin" .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_84.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_trumpet_60:: DirectSoundWaveData_sc88pro_trumpet_60::
.incbin "sound/direct_sound_samples/sc88_trumpet_60.bin" .incbin "sound/direct_sound_samples/sc88pro_trumpet_60.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_trumpet_72:: DirectSoundWaveData_sc88pro_trumpet_72::
.incbin "sound/direct_sound_samples/sc88_trumpet_72.bin" .incbin "sound/direct_sound_samples/sc88pro_trumpet_72.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_trumpet_84:: DirectSoundWaveData_sc88pro_trumpet_84::
.incbin "sound/direct_sound_samples/sc88_trumpet_84.bin" .incbin "sound/direct_sound_samples/sc88pro_trumpet_84.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_trombone_39:: DirectSoundWaveData_sc88pro_tuba_39:: @N.B.: These tuba samples are actually sampled at 36 and 48, then pitched up
.incbin "sound/direct_sound_samples/unknown_trombone_39.bin" .incbin "sound/direct_sound_samples/sc88pro_tuba_39.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_trombone_51:: DirectSoundWaveData_sc88pro_tuba_51::
.incbin "sound/direct_sound_samples/unknown_trombone_51.bin" .incbin "sound/direct_sound_samples/sc88pro_tuba_51.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_french_horn_60:: DirectSoundWaveData_sc88pro_french_horn_60::
.incbin "sound/direct_sound_samples/sc88_french_horn_60.bin" .incbin "sound/direct_sound_samples/sc88pro_french_horn_60.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_french_horn_72:: DirectSoundWaveData_sc88pro_french_horn_72::
.incbin "sound/direct_sound_samples/sc88_french_horn_72.bin" .incbin "sound/direct_sound_samples/sc88pro_french_horn_72.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_flute:: DirectSoundWaveData_sc88pro_flute::
.incbin "sound/direct_sound_samples/sc88_flute.bin" .incbin "sound/direct_sound_samples/sc88pro_flute.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_pick_bass:: DirectSoundWaveData_sc88pro_fingered_bass::
.incbin "sound/direct_sound_samples/sc88_pick_bass.bin" .incbin "sound/direct_sound_samples/sc88pro_fingered_bass.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_koto_high:: DirectSoundWaveData_unknown_koto_high::
@@ -243,12 +243,12 @@ DirectSoundWaveData_heart_of_asia_gamelan::
.incbin "sound/direct_sound_samples/heart_of_asia_gamelan.bin" .incbin "sound/direct_sound_samples/heart_of_asia_gamelan.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_church_organ:: DirectSoundWaveData_sc88pro_church_organ3_low::
.incbin "sound/direct_sound_samples/unknown_church_organ.bin" .incbin "sound/direct_sound_samples/sc88pro_church_organ3_low.bin"
.align 2 .align 2
DirectSoundWaveData_emu_ii_pipe_organ:: DirectSoundWaveData_sc88pro_church_organ3_high::
.incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin" .incbin "sound/direct_sound_samples/sc88pro_church_organ3_high.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_female_voice:: DirectSoundWaveData_unknown_female_voice::
@@ -267,16 +267,16 @@ DirectSoundWaveData_sd90_classical_detuned_ep1_high::
.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin" .incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_timpani_with_snare:: DirectSoundWaveData_sc88pro_timpani_with_snare::
.incbin "sound/direct_sound_samples/sc88_timpani_with_snare.bin" .incbin "sound/direct_sound_samples/sc88pro_timpani_with_snare.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_synth_snare:: DirectSoundWaveData_unknown_synth_snare::
.incbin "sound/direct_sound_samples/unknown_synth_snare.bin" .incbin "sound/direct_sound_samples/unknown_synth_snare.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_square_wave:: DirectSoundWaveData_sc88pro_square_wave::
.incbin "sound/direct_sound_samples/sc88_square_wave.bin" .incbin "sound/direct_sound_samples/sc88pro_square_wave.bin"
.align 2 .align 2
DirectSoundWaveData_bicycle_bell:: DirectSoundWaveData_bicycle_bell::
@@ -287,8 +287,8 @@ DirectSoundWaveData_8725A2C::
.incbin "sound/direct_sound_samples/8725A2C.bin" .incbin "sound/direct_sound_samples/8725A2C.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_pizzicato_strings:: DirectSoundWaveData_sc88pro_pizzicato_strings::
.incbin "sound/direct_sound_samples/sc88_pizzicato_strings.bin" .incbin "sound/direct_sound_samples/sc88pro_pizzicato_strings.bin"
.align 2 .align 2
DirectSoundWaveData_872762C:: DirectSoundWaveData_872762C::
@@ -303,12 +303,12 @@ DirectSoundWaveData_872A5D0::
.incbin "sound/direct_sound_samples/872A5D0.bin" .incbin "sound/direct_sound_samples/872A5D0.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_wind:: DirectSoundWaveData_sc88pro_wind::
.incbin "sound/direct_sound_samples/sc88_wind.bin" .incbin "sound/direct_sound_samples/sc88pro_wind.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_bubbles:: DirectSoundWaveData_sc88pro_bubbles::
.incbin "sound/direct_sound_samples/sc88_bubbles.bin" .incbin "sound/direct_sound_samples/sc88pro_bubbles.bin"
.align 2 .align 2
DirectSoundWaveData_872EEA8:: DirectSoundWaveData_872EEA8::
@@ -319,8 +319,8 @@ DirectSoundWaveData_87301B0::
.incbin "sound/direct_sound_samples/87301B0.bin" .incbin "sound/direct_sound_samples/87301B0.bin"
.align 2 .align 2
DirectSoundWaveData_unused_acid_bass:: DirectSoundWaveData_trinity_30303_mega_bass::
.incbin "sound/direct_sound_samples/unused_acid_bass.bin" .incbin "sound/direct_sound_samples/trinity_30303_mega_bass.bin"
.align 2 .align 2
DirectSoundWaveData_8734298:: DirectSoundWaveData_8734298::
@@ -331,24 +331,24 @@ DirectSoundWaveData_87364A8::
.incbin "sound/direct_sound_samples/87364A8.bin" .incbin "sound/direct_sound_samples/87364A8.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_tubular_bell:: DirectSoundWaveData_sc88pro_tubular_bell::
.incbin "sound/direct_sound_samples/sc88_tubular_bell.bin" .incbin "sound/direct_sound_samples/sc88pro_tubular_bell.bin"
.align 2 .align 2
DirectSoundWaveData_87385E4:: DirectSoundWaveData_87385E4::
.incbin "sound/direct_sound_samples/87385E4.bin" .incbin "sound/direct_sound_samples/87385E4.bin"
.align 2 .align 2
DirectSoundWaveData_unknown_polysynth:: DirectSoundWaveData_trinity_big_boned::
.incbin "sound/direct_sound_samples/unknown_polysynth.bin" .incbin "sound/direct_sound_samples/trinity_big_boned.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_harp:: DirectSoundWaveData_sc88pro_harp::
.incbin "sound/direct_sound_samples/sc88_harp.bin" .incbin "sound/direct_sound_samples/sc88pro_harp.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_xylophone:: DirectSoundWaveData_sc88pro_xylophone::
.incbin "sound/direct_sound_samples/sc88_xylophone.bin" .incbin "sound/direct_sound_samples/sc88pro_xylophone.bin"
.align 2 .align 2
DirectSoundWaveData_873ECD8:: DirectSoundWaveData_873ECD8::
@@ -359,8 +359,8 @@ DirectSoundWaveData_8740818::
.incbin "sound/direct_sound_samples/8740818.bin" .incbin "sound/direct_sound_samples/8740818.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_accordion:: DirectSoundWaveData_sc88pro_accordion::
.incbin "sound/direct_sound_samples/sc88_accordion.bin" .incbin "sound/direct_sound_samples/sc88pro_accordion.bin"
.align 2 .align 2
DirectSoundWaveData_87424B0:: DirectSoundWaveData_87424B0::
@@ -1947,8 +1947,8 @@ DirectSoundWaveData_88D6978::
.incbin "sound/direct_sound_samples/88D6978.bin" .incbin "sound/direct_sound_samples/88D6978.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_nylon_str_guitar:: DirectSoundWaveData_sc88pro_nylon_str_guitar::
.incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin" .incbin "sound/direct_sound_samples/sc88pro_nylon_str_guitar.bin"
.align 2 .align 2
DirectSoundWaveData_sd90_special_scream_drive:: DirectSoundWaveData_sd90_special_scream_drive::
@@ -2159,8 +2159,8 @@ DirectSoundWaveData_88F6498::
.incbin "sound/direct_sound_samples/88F6498.bin" .incbin "sound/direct_sound_samples/88F6498.bin"
.align 2 .align 2
DirectSoundWaveData_sc88_accordion_duplicate:: DirectSoundWaveData_sc88pro_accordion_duplicate::
.incbin "sound/direct_sound_samples/sc88_accordion_duplicate.bin" .incbin "sound/direct_sound_samples/sc88pro_accordion_duplicate.bin"
.align 2 .align 2
DirectSoundWaveData_steinway_b_piano:: DirectSoundWaveData_steinway_b_piano::
sound/direct_sound_samples/unknown_anvil_low.aif → sound/direct_sound_samples/ethnic_flavours_atarigane.aif
View File
sound/direct_sound_samples/unknown_wood_block_high.aif → sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif
View File
sound/direct_sound_samples/unknown_tsuzumi.aif → sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif
View File
sound/direct_sound_samples/unknown_wood_block_low.aif → sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif
View File
sound/direct_sound_samples/sc88_accordion.aif → sound/direct_sound_samples/sc88pro_accordion.aif
View File
sound/direct_sound_samples/sc88_accordion_duplicate.aif → sound/direct_sound_samples/sc88pro_accordion_duplicate.aif
View File
sound/direct_sound_samples/sc88_bubbles.aif → sound/direct_sound_samples/sc88pro_bubbles.aif
View File
sound/direct_sound_samples/emu_ii_pipe_organ.aif → sound/direct_sound_samples/sc88pro_church_organ3_high.aif
View File
sound/direct_sound_samples/unknown_church_organ.aif → sound/direct_sound_samples/sc88pro_church_organ3_low.aif
View File
sound/direct_sound_samples/sc88_pick_bass.aif → sound/direct_sound_samples/sc88pro_fingered_bass.aif
View File
sound/direct_sound_samples/sc88_flute.aif → sound/direct_sound_samples/sc88pro_flute.aif
View File
sound/direct_sound_samples/sc88_french_horn_60.aif → sound/direct_sound_samples/sc88pro_french_horn_60.aif
View File
sound/direct_sound_samples/sc88_french_horn_72.aif → sound/direct_sound_samples/sc88pro_french_horn_72.aif
View File
sound/direct_sound_samples/sc88_fretless_bass.aif → sound/direct_sound_samples/sc88pro_fretless_bass.aif
View File
sound/direct_sound_samples/sc88_glockenspiel.aif → sound/direct_sound_samples/sc88pro_glockenspiel.aif
View File
sound/direct_sound_samples/sc88_harp.aif → sound/direct_sound_samples/sc88pro_harp.aif
View File
sound/direct_sound_samples/sc88_standard_bells.aif → sound/direct_sound_samples/sc88pro_jingle_bell.aif
View File
sound/direct_sound_samples/sc88_bongo.aif → sound/direct_sound_samples/sc88pro_mute_high_conga.aif
View File
sound/direct_sound_samples/sc88_nylon_str_guitar.aif → sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif
View File
sound/direct_sound_samples/sc88_bongo_low.aif → sound/direct_sound_samples/sc88pro_open_low_conga.aif
View File
sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif → sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif
View File
sound/direct_sound_samples/sc88_orchestra_snare.aif → sound/direct_sound_samples/sc88pro_orchestra_snare.aif
View File
sound/direct_sound_samples/sc88_organ2.aif → sound/direct_sound_samples/sc88pro_organ2.aif
View File
sound/direct_sound_samples/sc88_piano1_48.aif → sound/direct_sound_samples/sc88pro_piano1_48.aif
View File
sound/direct_sound_samples/sc88_piano1_60.aif → sound/direct_sound_samples/sc88pro_piano1_60.aif
View File
sound/direct_sound_samples/sc88_piano1_72.aif → sound/direct_sound_samples/sc88pro_piano1_72.aif
View File
sound/direct_sound_samples/sc88_piano1_84.aif → sound/direct_sound_samples/sc88pro_piano1_84.aif
View File
sound/direct_sound_samples/sc88_pizzicato_strings.aif → sound/direct_sound_samples/sc88pro_pizzicato_strings.aif
View File
sound/direct_sound_samples/sc88_standard_kick.aif → sound/direct_sound_samples/sc88pro_rnd_kick.aif
View File
sound/direct_sound_samples/sc88_standard3_snare.aif → sound/direct_sound_samples/sc88pro_rnd_snare.aif
View File
sound/direct_sound_samples/jv1080_slap_bass.aif → sound/direct_sound_samples/sc88pro_slap_bass.aif
View File
sound/direct_sound_samples/sc88_square_wave.aif → sound/direct_sound_samples/sc88pro_square_wave.aif
View File
sound/direct_sound_samples/sc88_string_ensemble_60.aif → sound/direct_sound_samples/sc88pro_string_ensemble_60.aif
View File
sound/direct_sound_samples/sc88_string_ensemble_72.aif → sound/direct_sound_samples/sc88pro_string_ensemble_72.aif
View File
sound/direct_sound_samples/sc88_string_ensemble_84.aif → sound/direct_sound_samples/sc88pro_string_ensemble_84.aif
View File
sound/direct_sound_samples/sc88_synth_bass.aif → sound/direct_sound_samples/sc88pro_synth_bass.aif
View File
sound/direct_sound_samples/unknown_ethnic_drum.aif → sound/direct_sound_samples/sc88pro_taiko.aif
View File
sound/direct_sound_samples/unknown_tambourine.aif → sound/direct_sound_samples/sc88pro_tambourine.aif
View File
sound/direct_sound_samples/sc88_timpani.aif → sound/direct_sound_samples/sc88pro_timpani.aif
View File
sound/direct_sound_samples/sc88_timpani_with_snare.aif → sound/direct_sound_samples/sc88pro_timpani_with_snare.aif
View File
sound/direct_sound_samples/sc88_standard_hand_clap.aif → sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif
View File
sound/direct_sound_samples/sc88_trumpet_60.aif → sound/direct_sound_samples/sc88pro_trumpet_60.aif
View File
sound/direct_sound_samples/sc88_trumpet_72.aif → sound/direct_sound_samples/sc88pro_trumpet_72.aif
View File
sound/direct_sound_samples/sc88_trumpet_84.aif → sound/direct_sound_samples/sc88pro_trumpet_84.aif
View File
sound/direct_sound_samples/unknown_trombone_39.aif → sound/direct_sound_samples/sc88pro_tuba_39.aif
View File
sound/direct_sound_samples/unknown_trombone_51.aif → sound/direct_sound_samples/sc88pro_tuba_51.aif
View File
sound/direct_sound_samples/sc88_tubular_bell.aif → sound/direct_sound_samples/sc88pro_tubular_bell.aif
View File
sound/direct_sound_samples/sc88_wind.aif → sound/direct_sound_samples/sc88pro_wind.aif
View File
sound/direct_sound_samples/sc88_xylophone.aif → sound/direct_sound_samples/sc88pro_xylophone.aif
View File
sound/direct_sound_samples/unknown_cowbell.aif → sound/direct_sound_samples/sd90_cowbell.aif
View File
sound/direct_sound_samples/unknown_anvil_high.aif → sound/direct_sound_samples/sd90_open_triangle.aif
View File
sound/direct_sound_samples/unused_acid_bass.aif → sound/direct_sound_samples/trinity_30303_mega_bass.aif
View File
sound/direct_sound_samples/unknown_polysynth.aif → sound/direct_sound_samples/trinity_big_boned.aif
View File
sound/direct_sound_samples/unused_electric_guitar.aif → sound/direct_sound_samples/unused_guitar_separates_power_chord.aif
View File
sound/direct_sound_samples/unknown_djembe.aif → sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif
View File
sound/direct_sound_samples/unknown_tom.aif → sound/direct_sound_samples/unused_sc55_tom.aif
View File
sound/direct_sound_samples/unused_sc88_unison_slap.aif → sound/direct_sound_samples/unused_sc88pro_unison_slap.aif
View File
sound/voicegroups/voicegroup000.inc
+58 -58
View File
@@ -2,64 +2,64 @@
voicegroup000:: @ 8675D04 voicegroup000:: @ 8675D04
voice_keysplit_all voicegroup001 @ 8675D04 voice_keysplit_all voicegroup001 @ 8675D04
voice_keysplit voicegroup005, KeySplitTable1 @ 8675D10 voice_keysplit voicegroup005, KeySplitTable1 @ 8675D10
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D1C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D28
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D34
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D40
voice_square_2 2, 0, 0, 9, 2 @ 8675D4C voice_square_2 60, 0, 2, 0, 0, 9, 2 @ 8675D4C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D58
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D64
voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 8675D70 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 @ 8675D70
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D7C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D88
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675D94
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DA0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DAC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DC4
voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8675DD0 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8675DD0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DDC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DE8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675DF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E00
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E0C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E18
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E24
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E30
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E3C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E48
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E54
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E60
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E6C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E78
voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8675E84 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 @ 8675E84
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E90
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675E9C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675EA8
voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8675EB4 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 @ 8675EB4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675EC0
voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8675ECC voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8675ECC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675ED8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675ED8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675EE4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675EF0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675EFC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F08
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F14
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F20
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F2C
voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 8675F38 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 @ 8675F38
voice_keysplit voicegroup006, KeySplitTable2 @ 8675F44 voice_keysplit voicegroup006, KeySplitTable2 @ 8675F44
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F50
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F5C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F68
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F74
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F80
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F8C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675F98
voice_keysplit voicegroup007, KeySplitTable3 @ 8675FA4 voice_keysplit voicegroup007, KeySplitTable3 @ 8675FA4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FB0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FD4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FE0
sound/voicegroups/voicegroup001.inc
+28 -28
View File
@@ -1,32 +1,32 @@
.align 2 .align 2
voicegroup001:: @ 8675FEC voicegroup001:: @ 8675FEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8675FF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676004 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676004
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676010 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676010
voice_square_1 0, 2, 0, 0, 15, 0 @ 867601C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867601C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676028 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676028
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676034 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676034
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676040 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676040
voice_square_1 0, 2, 0, 1, 6, 0 @ 867604C voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 @ 867604C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676058 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676058
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676064 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676064
voice_programmable_wave ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 8676070 voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 8676070
voice_square_1 0, 2, 0, 0, 15, 0 @ 867607C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867607C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676088 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676088
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676094 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676094
voice_square_1 0, 2, 0, 0, 15, 0 @ 86760A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86760A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86760AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86760AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86760B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86760B8
voice_square_2 2, 0, 1, 6, 0 @ 86760C4 voice_square_2 60, 0, 2, 0, 1, 6, 0 @ 86760C4
voice_programmable_wave ProgrammableWaveData_86B4850, 0, 7, 15, 1 @ 86760D0 voice_programmable_wave 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1 @ 86760D0
voice_square_1 0, 2, 0, 1, 6, 0 @ 86760DC voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 @ 86760DC
voice_square_2 3, 0, 1, 6, 0 @ 86760E8 voice_square_2 60, 0, 3, 0, 1, 6, 0 @ 86760E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86760F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86760F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676100 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676100
voice_square_1 0, 2, 0, 0, 15, 0 @ 867610C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867610C
voice_square_1 0, 0, 0, 1, 6, 0 @ 8676118 voice_square_1 60, 0, 0, 0, 0, 1, 6, 0 @ 8676118
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676124 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676124
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676130 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676130
voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 867613C voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 867613C
sound/voicegroups/voicegroup002.inc
+37 -37
View File
@@ -2,56 +2,56 @@
voicegroup002:: @ 8676148 voicegroup002:: @ 8676148
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ 8676148 voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ 8676148
voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ 8676154 voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ 8676154
voice_directsound 60, 0, DirectSoundWaveData_unused_electric_guitar, 255, 165, 206, 127 @ 8676160 voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 @ 8676160
voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 206, 127 @ 867616C voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127 @ 867616C
voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 @ 8676178 voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 @ 8676178
voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 8676184 voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 @ 8676184
voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 8676190 voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 8676190
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867619C voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242 @ 867619C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86761A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86761A8
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86761B4 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 86761B4
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86761C0 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86761C0
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86761CC voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86761CC
voice_directsound 48, 44, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 86761D8 voice_directsound 48, 44, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204 @ 86761D8
voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 86761E4 voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 86761E4
voice_directsound 51, 54, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204 @ 86761F0 voice_directsound 51, 54, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204 @ 86761F0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86761FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86761FC
voice_directsound 54, 64, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204 @ 8676208 voice_directsound 54, 64, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204 @ 8676208
voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0 @ 8676214 voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0 @ 8676214
voice_directsound 57, 69, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 8676220 voice_directsound 57, 69, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204 @ 8676220
voice_directsound 60, 79, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 867622C voice_directsound 60, 79, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204 @ 867622C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676238 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676238
voice_directsound 62, 84, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 8676244 voice_directsound 62, 84, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204 @ 8676244
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676250 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676250
voice_square_1 0, 2, 0, 0, 15, 0 @ 867625C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867625C
voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231 @ 8676268 voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231 @ 8676268
voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676274 voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 8676274
voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 @ 8676280 voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 @ 8676280
voice_square_1 0, 2, 0, 0, 15, 0 @ 867628C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867628C
voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8676298 voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8676298
voice_square_1 0, 2, 0, 0, 15, 0 @ 86762A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86762A4
voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 86762B0 voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 86762B0
voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86762BC voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86762BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86762C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86762C8
voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86762D4 voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86762D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86762E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86762E0
voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86762EC voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86762EC
voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86762F8 voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86762F8
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676304 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676304
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676310 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676310
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867631C voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 867631C
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676328 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 8676328
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676334 voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676334
voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676340 voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 8676340
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867634C voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867634C
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676358 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 8676358
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676364 voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676364
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676370 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 8676370
voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867637C voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867637C
voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676388 voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676388
voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676394 voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676394
voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86763A0 voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86763A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86763AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86763AC
voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763B8 voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763B8
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86763C4 voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86763C4
sound/voicegroups/voicegroup003.inc
+45 -45
View File
@@ -1,57 +1,57 @@
.align 2 .align 2
voicegroup003:: @ 86763D0 voicegroup003:: @ 86763D0
voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86763D0 voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 86763D0
voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86763DC voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86763DC
voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86763E8 voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86763E8
voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763F4 voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676400 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676400
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867640C voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867640C
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676418 voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676418
voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676424 voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 8676424
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676430 voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 8676430
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867643C voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 867643C
voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676448 voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 8676448
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676454
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676460 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676460
voice_square_1 0, 2, 0, 0, 15, 0 @ 867646C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867646C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676478 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676478
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676484 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676484
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676490 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676490
voice_square_1 0, 2, 0, 0, 15, 0 @ 867649C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867649C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764CC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764D8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764E4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764F0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86764FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86764FC
voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676508 voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676508
voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676514 voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676514
voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 8676520 voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 8676520
voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 867652C voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 867652C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676538 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676538
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676544 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676544
voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 8676550 voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676550
voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 867655C voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 867655C
voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676568 voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676568
voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676574 voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676574
voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676580 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 8676580
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 867658C voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 867658C
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676598 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676598
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86765A4 voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86765A4
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86765B0 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86765B0
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765BC voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765BC
voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86765C8 voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86765C8
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765D4 voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765D4
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86765E0 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 86765E0
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765EC voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765EC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86765F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86765F8
voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676604 voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676604
voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676610 voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676610
voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867661C voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867661C
voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 8676628 voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235 @ 8676628
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676634 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676634
voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676640 voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676640
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 867664C voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 867664C
sound/voicegroups/voicegroup004.inc
+79 -79
View File
@@ -1,93 +1,93 @@
.align 2 .align 2
voicegroup004:: @ 8676658 voicegroup004:: @ 8676658
voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676658 voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 8676658
voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 8676664 voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 8676664
voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 8676670 voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 8676670
voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867667C voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867667C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676688 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676688
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676694 voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676694
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86766A0 voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86766A0
voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86766AC voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 86766AC
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86766B8 voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86766B8
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86766C4 voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86766C4
voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86766D0 voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86766D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86766DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86766DC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86766E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86766E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86766F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86766F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676700
voice_square_1 0, 2, 0, 0, 15, 0 @ 867670C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867670C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676718 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676718
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676724 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676724
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676730 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676730
voice_square_1 0, 2, 0, 0, 15, 0 @ 867673C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867673C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676748 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676748
voice_directsound_no_resample 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 8676754 voice_directsound_no_resample 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 8676754
voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 8676760 voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 @ 8676760
voice_square_1 0, 2, 0, 0, 15, 0 @ 867676C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867676C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676778
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676784 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676784
voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676790 voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676790
voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 867679C voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 867679C
voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86767A8 voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 86767A8
voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86767B4 voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 86767B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86767C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86767C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86767CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86767CC
voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86767D8 voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86767D8
voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86767E4 voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 86767E4
voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767F0 voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86767F0
voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767FC voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86767FC
voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 8676808 voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 8676808
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676814 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 8676814
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676820 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676820
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867682C voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 867682C
voice_directsound 65, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676838 voice_directsound 65, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 8676838
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676844 voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676844
voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676850 voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 8676850
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867685C voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867685C
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676868 voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 8676868
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676874 voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676874
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676880
voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867688C voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867688C
voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676898 voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676898
voice_directsound 56, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768A4 voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768A4
voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 86768B0 voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235 @ 86768B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86768BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86768BC
voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768C8 voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768C8
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86768D4 voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86768D4
voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86768E0 voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 86768E0
voice_directsound 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86768EC voice_directsound 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86768EC
voice_directsound 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86768F8 voice_directsound 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86768F8
voice_directsound 60, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676904 voice_directsound 60, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676904
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676910 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676910
voice_directsound 58, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867691C voice_directsound 58, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867691C
voice_directsound 62, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676928 voice_directsound 62, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676928
voice_directsound 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676934 voice_directsound 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 8676934
voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676940 voice_directsound 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 8676940
voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867694C voice_directsound 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 867694C
voice_directsound 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676958 voice_directsound 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 8676958
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676964 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676964
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676970 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676970
voice_square_1 0, 2, 0, 0, 15, 0 @ 867697C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867697C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676988 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676988
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676994 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676994
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769D0
voice_directsound 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 86769DC voice_directsound 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 86769DC
voice_directsound 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 86769E8 voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 @ 86769E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86769F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86769F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A00
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A0C
voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676A18 voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676A18
voice_directsound 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676A24 voice_directsound 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676A24
voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 8676A30 voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 8676A30
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 8676A3C voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 8676A3C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A48
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676A54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A54
voice_directsound 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 8676A60 voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676A60
voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676A6C voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 8676A6C
voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A78 voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A78
voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A84 voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A84
sound/voicegroups/voicegroup005.inc
+4 -4
View File
@@ -1,7 +1,7 @@
.align 2 .align 2
voicegroup005:: @ 8676A90 voicegroup005:: @ 8676A90
voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_48, 255, 252, 0, 239 @ 8676A90 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239 @ 8676A90
voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_60, 255, 250, 0, 221 @ 8676A9C voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221 @ 8676A9C
voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_72, 255, 250, 0, 221 @ 8676AA8 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221 @ 8676AA8
voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_84, 255, 247, 0, 221 @ 8676AB4 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221 @ 8676AB4
sound/voicegroups/voicegroup006.inc
+3 -3
View File
@@ -1,6 +1,6 @@
.align 2 .align 2
voicegroup006:: @ 8676AC0 voicegroup006:: @ 8676AC0
voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_60, 255, 0, 255, 196 @ 8676AC0 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196 @ 8676AC0
voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 196 @ 8676ACC voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196 @ 8676ACC
voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_84, 255, 0, 255, 196 @ 8676AD8 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196 @ 8676AD8
sound/voicegroups/voicegroup007.inc
+131 -131
View File
@@ -1,134 +1,134 @@
.align 2 .align 2
voicegroup007:: @ 8676AE4 voicegroup007:: @ 8676AE4
voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_60, 255, 0, 193, 127 @ 8676AE4 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127 @ 8676AE4
voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_72, 255, 0, 193, 127 @ 8676AF0 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127 @ 8676AF0
voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_84, 255, 0, 193, 127 @ 8676AFC voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127 @ 8676AFC
voice_square_1_alt 38, 2, 1, 0, 0, 0 @ 8676B08 voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0 @ 8676B08
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B14
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B20
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B2C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B38
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B44
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B50
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B5C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B68
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B74
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B80
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B8C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676B98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676B98
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BA4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BB0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BD4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BE0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676BF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676BF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C04
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C10
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C1C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C28
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C34
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C40
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C4C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C58
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C64
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C70
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C7C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C88
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676C94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676C94
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CA0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CAC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CC4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CD0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CDC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CE8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676CF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676CF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D00
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D0C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D18
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D24
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D30
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D3C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D48
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D54
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D60
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D6C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D78
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D84
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D90
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676D9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676D9C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DA8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DB4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DC0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DCC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DD8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DE4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DF0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676DFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676DFC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E08
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E14
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E20
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E2C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E38
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E44
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E50
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E5C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E68
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E74
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E80
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E8C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676E98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676E98
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EA4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EB0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676ED4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676ED4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EE0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676EF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676EF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F04
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F10
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F1C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F28
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F34
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F40
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F4C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F58
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F64
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F70
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F7C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F88
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676F94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676F94
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FA0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FAC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FC4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FD0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FDC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FE8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676FF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677000
voice_square_1 0, 2, 0, 0, 15, 0 @ 867700C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867700C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677018 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677018
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677024 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677024
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677030 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677030
voice_square_1 0, 2, 0, 0, 15, 0 @ 867703C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867703C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677048 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677048
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677054 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677054
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677060 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677060
voice_square_1 0, 2, 0, 0, 15, 0 @ 867706C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867706C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677078 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677078
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677084 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677084
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677090 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677090
voice_square_1 0, 2, 0, 0, 15, 0 @ 867709C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867709C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770CC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770D8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86770E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86770E4
voice_square_1_alt 36, 2, 0, 1, 4, 2 @ 86770F0 voice_square_1_alt 60, 0, 36, 2, 0, 1, 4, 2 @ 86770F0
voice_square_1_alt 21, 2, 0, 0, 15, 2 @ 86770FC voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2 @ 86770FC
sound/voicegroups/voicegroup008.inc
+2 -2
View File
@@ -1,5 +1,5 @@
.align 2 .align 2
voicegroup008:: @ 8677108 voicegroup008:: @ 8677108
voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_39, 255, 0, 255, 165 @ 8677108 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165 @ 8677108
voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_51, 255, 0, 255, 165 @ 8677114 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165 @ 8677114
sound/voicegroups/voicegroup009.inc
+2 -2
View File
@@ -1,5 +1,5 @@
.align 2 .align 2
voicegroup009:: @ 8677120 voicegroup009:: @ 8677120
voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_60, 255, 0, 224, 165 @ 8677120 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165 @ 8677120
voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 255, 0, 218, 165 @ 867712C voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165 @ 867712C
sound/voicegroups/voicegroup010.inc
+79 -79
View File
@@ -1,87 +1,87 @@
.align 2 .align 2
voicegroup010:: @ 8677138 voicegroup010:: @ 8677138
voice_keysplit_all voicegroup031 @ 8677138 voice_keysplit_all voicegroup031 @ 8677138
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677144 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677144
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677150 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677150
voice_square_1 0, 2, 0, 0, 15, 0 @ 867715C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867715C
voice_square_2 3, 0, 4, 0, 1 @ 8677168 voice_square_2 60, 0, 3, 0, 4, 0, 1 @ 8677168
voice_square_1 0, 3, 0, 4, 0, 1 @ 8677174 voice_square_1 60, 0, 0, 3, 0, 4, 0, 1 @ 8677174
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677180 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677180
voice_square_1 0, 2, 0, 0, 15, 0 @ 867718C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867718C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677198 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677198
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771A4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771D4
voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 86771E0 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242 @ 86771E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771EC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86771F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86771F8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677204 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677204
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677210 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677210
voice_square_1 0, 2, 0, 0, 15, 0 @ 867721C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867721C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677228 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677228
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677234 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677234
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677240 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677240
voice_square_1 0, 2, 0, 0, 15, 0 @ 867724C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867724C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677258 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677258
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677264 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677264
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677270 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677270
voice_square_1 0, 2, 0, 0, 15, 0 @ 867727C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867727C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677288 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677288
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677294 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677294
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772DC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86772F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86772F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677300
voice_square_1 0, 2, 0, 0, 15, 0 @ 867730C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867730C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677318 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677318
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677324 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677324
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677330 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677330
voice_square_1 0, 2, 0, 0, 15, 0 @ 867733C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867733C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677348 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677348
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677354 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677354
voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 8677360 voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 8677360
voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 867736C voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 867736C
voice_keysplit voicegroup006, KeySplitTable2 @ 8677378 voice_keysplit voicegroup006, KeySplitTable2 @ 8677378
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677384 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677384
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677390 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677390
voice_square_1 0, 2, 0, 0, 15, 0 @ 867739C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867739C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773CC
voice_keysplit voicegroup007, KeySplitTable3 @ 86773D8 voice_keysplit voicegroup007, KeySplitTable3 @ 86773D8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773E4
voice_keysplit voicegroup008, KeySplitTable4 @ 86773F0 voice_keysplit voicegroup008, KeySplitTable4 @ 86773F0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86773FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86773FC
voice_keysplit voicegroup009, KeySplitTable5 @ 8677408 voice_keysplit voicegroup009, KeySplitTable5 @ 8677408
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677414 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677414
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677420 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677420
voice_square_1 0, 2, 0, 0, 15, 0 @ 867742C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867742C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677438 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677438
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677444 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677444
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677450 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677450
voice_square_1 0, 2, 0, 0, 15, 0 @ 867745C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867745C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677468 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677468
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677474
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677480 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677480
voice_square_1 0, 2, 0, 0, 15, 0 @ 867748C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 867748C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8677498 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8677498
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774A4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86774EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86774EC
voice_square_2 3, 0, 1, 7, 1 @ 86774F8 voice_square_2 60, 0, 3, 0, 1, 7, 1 @ 86774F8
voice_programmable_wave_alt ProgrammableWaveData_86B4890, 0, 7, 15, 2 @ 8677504 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2 @ 8677504
voice_square_1 0, 3, 0, 1, 7, 1 @ 8677510 voice_square_1 60, 0, 0, 3, 0, 1, 7, 1 @ 8677510
voice_square_1 0, 3, 0, 0, 7, 1 @ 867751C voice_square_1 60, 0, 0, 3, 0, 0, 7, 1 @ 867751C

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