summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/event.inc24
-rw-r--r--sound/direct_sound_data.inc40
-rw-r--r--sound/direct_sound_samples/classical_choir_voice_ahhs.aif (renamed from sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif)bin5903 -> 5903 bytes
-rw-r--r--sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif (renamed from sound/direct_sound_samples/sc88_standard_cymbal_crash.aif)bin3979 -> 3979 bytes
-rw-r--r--sound/direct_sound_samples/sc88_orchestra_snare.aif (renamed from sound/direct_sound_samples/sc88_standard_snare2.aif)bin2231 -> 2231 bytes
-rw-r--r--sound/direct_sound_samples/sc88_square_wave.aif (renamed from sound/direct_sound_samples/unused_sc88_square.aif)bin7286 -> 7286 bytes
-rw-r--r--sound/direct_sound_samples/sc88_standard3_snare.aif (renamed from sound/direct_sound_samples/sc88_standard_snare1.aif)bin1844 -> 1844 bytes
-rw-r--r--sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif (renamed from sound/direct_sound_samples/unknown_e_piano_high.aif)bin5130 -> 5130 bytes
-rw-r--r--sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif (renamed from sound/direct_sound_samples/unknown_e_piano_low.aif)bin9929 -> 9929 bytes
-rw-r--r--sound/direct_sound_samples/sd90_special_scream_drive.aif (renamed from sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif)bin6298 -> 6298 bytes
-rw-r--r--sound/direct_sound_samples/trinity_cymbal_crash.aif (renamed from sound/direct_sound_samples/unknown_cymbal_crash.aif)bin2372 -> 2372 bytes
-rw-r--r--sound/direct_sound_samples/unknown_female_voice.aif (renamed from sound/direct_sound_samples/unused_unknown_female_voice.aif)bin5797 -> 5797 bytes
-rw-r--r--sound/voice_groups.inc254
-rw-r--r--src/data/trade.h37
-rw-r--r--src/trade.c240
15 files changed, 210 insertions, 385 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 764dcf054..df063b613 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -463,12 +463,12 @@
.2byte \Y
.endm
- @ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
+ @ Retrieves the number of Pokemon in the player's party, and stores that number in VAR_RESULT.
.macro getpartysize
.byte 0x43
.endm
- @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
+ @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
.macro giveitem index:req, quantity:req
.byte 0x44
.2byte \index
@@ -482,21 +482,21 @@
.2byte \quantity
.endm
- @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room.
+ @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room.
.macro checkitemspace index:req, quantity:req
.byte 0x46
.2byte \index
.2byte \quantity
.endm
- @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item.
+ @ Checks if the player has quantity or more of item index in their Bag. Sets VAR_RESULT to TRUE if the player has enough of the item, or FALSE if they have fewer than quantity of the item.
.macro checkitem index:req, quantity:req
.byte 0x47
.2byte \index
.2byte \quantity
.endm
- @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
+ @ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
.macro checkitemtype index:req
.byte 0x48
.2byte \index
@@ -534,7 +534,7 @@
.2byte \decoration
.endm
- @ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+ @ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
.macro checkdecorspace decoration:req
.byte 0x4e
.2byte \decoration
@@ -816,7 +816,7 @@
.byte 0x6d
.endm
- @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
+ @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in VAR_RESULT as NO (0) or YES (1). Pressing B is equivalent to answering NO
.macro yesnobox x:req, y:req
.byte 0x6e
.byte \x
@@ -923,7 +923,7 @@
.2byte \move
.endm
- @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
+ @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, VAR_RESULT is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE. VAR_0x8004 is also set to this Pokemon's species.
.macro checkpartymove index:req
.byte 0x7c
.2byte \index
@@ -1043,7 +1043,7 @@
.byte 0x8e
.endm
- @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT).
+ @ Stores a random integer between 0 and limit in VAR_RESULT.
.macro random limit:req
.byte 0x8f
.2byte \limit
@@ -1063,7 +1063,7 @@
.byte \check
.endm
- @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not.
+ @ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not.
.macro checkmoney value:req, check:req
.byte 0x92
.4byte \value
@@ -1152,7 +1152,7 @@
.2byte \heallocation
.endm
- @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
+ @ Checks the player's gender. If male, then MALE (0) is stored in VAR_RESULT. If female, then FEMALE (1) is stored in VAR_RESULT.
.macro checkplayergender
.byte 0xa0
.endm
@@ -1435,7 +1435,7 @@
.2byte \slot
.endm
- @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokemon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
+ @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, VAR_RESULT is TRUE. If the Pokemon is obedient (or if the specified slot is empty or invalid), VAR_RESULT is FALSE.
.macro checkmonobedience slot:req
.byte 0xce
.2byte \slot
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index f1518ee4b..80f91a01d 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -23,8 +23,8 @@ DirectSoundWaveData_sc88_timpani::
.incbin "sound/direct_sound_samples/sc88_timpani.bin"
.align 2
-DirectSoundWaveData_advanced_orchestra_voice_ahhs::
- .incbin "sound/direct_sound_samples/advanced_orchestra_voice_ahhs.bin"
+DirectSoundWaveData_classical_choir_voice_ahhs::
+ .incbin "sound/direct_sound_samples/classical_choir_voice_ahhs.bin"
.align 2
DirectSoundWaveData_sd90_classical_oboe::
@@ -59,16 +59,16 @@ DirectSoundWaveData_sc88_standard_kick::
.incbin "sound/direct_sound_samples/sc88_standard_kick.bin"
.align 2
-DirectSoundWaveData_sc88_standard_snare1::
- .incbin "sound/direct_sound_samples/sc88_standard_snare1.bin"
+DirectSoundWaveData_sc88_standard3_snare::
+ .incbin "sound/direct_sound_samples/sc88_standard3_snare.bin"
.align 2
DirectSoundWaveData_sc88_standard_hand_clap::
.incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin"
.align 2
-DirectSoundWaveData_sc88_standard_snare2::
- .incbin "sound/direct_sound_samples/sc88_standard_snare2.bin"
+DirectSoundWaveData_sc88_orchestra_snare::
+ .incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin"
.align 2
DirectSoundWaveData_unknown_tom::
@@ -91,12 +91,12 @@ DirectSoundWaveData_unknown_tambourine::
.incbin "sound/direct_sound_samples/unknown_tambourine.bin"
.align 2
-DirectSoundWaveData_unknown_cymbal_crash::
- .incbin "sound/direct_sound_samples/unknown_cymbal_crash.bin"
+DirectSoundWaveData_trinity_cymbal_crash::
+ .incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin"
.align 2
-DirectSoundWaveData_sc88_standard_cymbal_crash::
- .incbin "sound/direct_sound_samples/sc88_standard_cymbal_crash.bin"
+DirectSoundWaveData_sc88_orchestra_cymbal_crash::
+ .incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin"
.align 2
DirectSoundWaveData_sc88_bongo::
@@ -251,20 +251,20 @@ DirectSoundWaveData_emu_ii_pipe_organ::
.incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin"
.align 2
-DirectSoundWaveData_unused_unknown_female_voice::
- .incbin "sound/direct_sound_samples/unused_unknown_female_voice.bin"
+DirectSoundWaveData_unknown_female_voice::
+ .incbin "sound/direct_sound_samples/unknown_female_voice.bin"
.align 2
DirectSoundWaveData_unused_unknown_male_voice::
.incbin "sound/direct_sound_samples/unused_unknown_male_voice.bin"
.align 2
-DirectSoundWaveData_unknown_e_piano_low::
- .incbin "sound/direct_sound_samples/unknown_e_piano_low.bin"
+DirectSoundWaveData_sd90_classical_detuned_ep1_low::
+ .incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_low.bin"
.align 2
-DirectSoundWaveData_unknown_e_piano_high::
- .incbin "sound/direct_sound_samples/unknown_e_piano_high.bin"
+DirectSoundWaveData_sd90_classical_detuned_ep1_high::
+ .incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin"
.align 2
DirectSoundWaveData_sc88_timpani_with_snare::
@@ -275,8 +275,8 @@ DirectSoundWaveData_unknown_synth_snare::
.incbin "sound/direct_sound_samples/unknown_synth_snare.bin"
.align 2
-DirectSoundWaveData_unused_sc88_square::
- .incbin "sound/direct_sound_samples/unused_sc88_square.bin"
+DirectSoundWaveData_sc88_square_wave::
+ .incbin "sound/direct_sound_samples/sc88_square_wave.bin"
.align 2
DirectSoundWaveData_bicycle_bell::
@@ -1951,8 +1951,8 @@ DirectSoundWaveData_sc88_nylon_str_guitar::
.incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin"
.align 2
-DirectSoundWaveData_sd90_classical_guitar_harmonics::
- .incbin "sound/direct_sound_samples/sd90_classical_guitar_harmonics.bin"
+DirectSoundWaveData_sd90_special_scream_drive::
+ .incbin "sound/direct_sound_samples/sd90_special_scream_drive.bin"
.align 2
DirectSoundWaveData_88DBBC0::
diff --git a/sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif b/sound/direct_sound_samples/classical_choir_voice_ahhs.aif
index e8784682e..e8784682e 100644
--- a/sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif
+++ b/sound/direct_sound_samples/classical_choir_voice_ahhs.aif
Binary files differ
diff --git a/sound/direct_sound_samples/sc88_standard_cymbal_crash.aif b/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif
index 576e3e19e..576e3e19e 100644
--- a/sound/direct_sound_samples/sc88_standard_cymbal_crash.aif
+++ b/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif
Binary files differ
diff --git a/sound/direct_sound_samples/sc88_standard_snare2.aif b/sound/direct_sound_samples/sc88_orchestra_snare.aif
index 36b640758..36b640758 100644
--- a/sound/direct_sound_samples/sc88_standard_snare2.aif
+++ b/sound/direct_sound_samples/sc88_orchestra_snare.aif
Binary files differ
diff --git a/sound/direct_sound_samples/unused_sc88_square.aif b/sound/direct_sound_samples/sc88_square_wave.aif
index 09e17f0ca..09e17f0ca 100644
--- a/sound/direct_sound_samples/unused_sc88_square.aif
+++ b/sound/direct_sound_samples/sc88_square_wave.aif
Binary files differ
diff --git a/sound/direct_sound_samples/sc88_standard_snare1.aif b/sound/direct_sound_samples/sc88_standard3_snare.aif
index 544b187d5..544b187d5 100644
--- a/sound/direct_sound_samples/sc88_standard_snare1.aif
+++ b/sound/direct_sound_samples/sc88_standard3_snare.aif
Binary files differ
diff --git a/sound/direct_sound_samples/unknown_e_piano_high.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif
index 86ea0fa76..86ea0fa76 100644
--- a/sound/direct_sound_samples/unknown_e_piano_high.aif
+++ b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif
Binary files differ
diff --git a/sound/direct_sound_samples/unknown_e_piano_low.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif
index fced03712..fced03712 100644
--- a/sound/direct_sound_samples/unknown_e_piano_low.aif
+++ b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif
Binary files differ
diff --git a/sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif b/sound/direct_sound_samples/sd90_special_scream_drive.aif
index 8b7a7da40..8b7a7da40 100644
--- a/sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif
+++ b/sound/direct_sound_samples/sd90_special_scream_drive.aif
Binary files differ
diff --git a/sound/direct_sound_samples/unknown_cymbal_crash.aif b/sound/direct_sound_samples/trinity_cymbal_crash.aif
index 4aec6882f..4aec6882f 100644
--- a/sound/direct_sound_samples/unknown_cymbal_crash.aif
+++ b/sound/direct_sound_samples/trinity_cymbal_crash.aif
Binary files differ
diff --git a/sound/direct_sound_samples/unused_unknown_female_voice.aif b/sound/direct_sound_samples/unknown_female_voice.aif
index b310823a7..b310823a7 100644
--- a/sound/direct_sound_samples/unused_unknown_female_voice.aif
+++ b/sound/direct_sound_samples/unknown_female_voice.aif
Binary files differ
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index c0f546ccf..4b71845aa 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -93,7 +93,7 @@ voicegroup001:: @ 8675FEC
voice_square_1 0, 0, 0, 1, 6, 0 @ 8676118
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676124
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676130
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 867613C
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 867613C
.align 2
voicegroup002:: @ 8676148
@@ -106,9 +106,9 @@ voicegroup002:: @ 8676148
voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 8676190
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867619C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86761A8
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86761B4
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_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_sc88_standard_snare2, 255, 0, 255, 242 @ 86761CC
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86761CC
voice_directsound 48, 44, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 86761D8
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
@@ -123,12 +123,12 @@ voicegroup002:: @ 8676148
voice_square_1 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 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676274
- voice_directsound_no_resample 60, 14, DirectSoundWaveData_unknown_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_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 8676298
+ voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8676298
voice_square_1 0, 2, 0, 0, 15, 0 @ 86762A4
- voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 86762B0
- voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86762BC
+ voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_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_square_1 0, 2, 0, 0, 15, 0 @ 86762C8
voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86762D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86762E0
@@ -137,30 +137,30 @@ voicegroup002:: @ 8676148
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, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867631C
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676328
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676328
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676334
- voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676340
+ voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676340
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867634C
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676358
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676358
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676364
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676370
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676370
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_no_resample 33, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676394
+ voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676394
voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86763A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86763AC
- voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86763B8
+ voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763B8
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86763C4
.align 2
voicegroup003:: @ 86763D0
voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86763D0
- voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_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, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86763F4
+ voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676400
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867640C
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 8676418
+ voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_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, 94, DirectSoundWaveData_unknown_djembe, 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_sc88_bongo_low, 255, 0, 255, 0 @ 867643C
@@ -194,30 +194,30 @@ voicegroup003:: @ 86763D0
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, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86765A4
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86765B0
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86765B0
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765BC
- voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86765C8
+ voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86765C8
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765D4
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86765E0
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86765E0
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86765EC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86765F8
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_no_resample 33, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867661C
+ voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867661C
voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 8676628
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676634
- voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676640
+ voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676640
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 867664C
.align 2
voicegroup004:: @ 8676658
voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 8676658
- voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_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, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867667C
+ voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867667C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676688
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676694
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86766A0
+ voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_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, 94, DirectSoundWaveData_unknown_djembe, 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_sc88_bongo_low, 255, 0, 255, 0 @ 86766C4
@@ -251,27 +251,27 @@ voicegroup004:: @ 8676658
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, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 867682C
- voice_directsound 65, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676838
+ voice_directsound 65, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676838
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676844
- voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8676850
+ voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676850
voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867685C
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8676868
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8676868
voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676874
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676880
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 56, 89, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86768A4
+ voice_directsound 56, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768A4
voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 86768B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86768BC
- voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86768C8
+ voice_directsound 63, 64, DirectSoundWaveData_sc88_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 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86768E0
- voice_directsound 64, 14, DirectSoundWaveData_unknown_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 60, 29, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 8676904
+ voice_directsound 60, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676904
voice_square_1 0, 2, 0, 0, 15, 0 @ 8676910
- voice_directsound 58, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 867691C
- voice_directsound 62, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 8676928
+ voice_directsound 58, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867691C
+ voice_directsound 62, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676928
voice_directsound 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676934
voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676940
voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867694C
@@ -1098,9 +1098,9 @@ voicegroup016:: @ 8678C74
voice_noise_alt 0, 0, 1, 0, 1 @ 8678E18
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 8678E24
voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E30
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 8678E3C
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 8678E3C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E48
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 8678E54
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8678E54
voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E60
voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E6C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8678E78
@@ -1623,9 +1623,9 @@ voicegroup022:: @ 867A438
voice_square_1_alt 0, 0, 0, 0, 7, 0 @ 867A5DC
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867A5E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 867A5F4
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 867A600
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 867A600
voice_square_1 0, 2, 0, 0, 15, 0 @ 867A60C
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 867A618
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 867A618
voice_square_1 0, 2, 0, 0, 15, 0 @ 867A624
voice_square_1 0, 2, 0, 0, 15, 0 @ 867A630
voice_square_1 0, 2, 0, 0, 15, 0 @ 867A63C
@@ -2420,7 +2420,7 @@ voicegroup031:: @ 867C838
voice_square_1 0, 2, 0, 0, 15, 0 @ 867C9F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA00
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA0C
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 867CA18
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 867CA18
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA24
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA30
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CA3C
@@ -2437,9 +2437,9 @@ voicegroup031:: @ 867C838
voice_directsound_no_resample 32, 49, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 867CAC0
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CACC
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAD8
- voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 867CAE4
+ voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 867CAE4
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CAF0
- voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 867CAFC
+ voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 867CAFC
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB08
voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB14
voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 867CB20
@@ -11583,7 +11583,7 @@ voicegroup107:: @ 8696A70
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CD4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CE0
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 8696CEC
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 8696CEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D04
voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D10
@@ -12040,7 +12040,7 @@ voicegroup111:: @ 8698054
voice_square_1 0, 2, 0, 0, 15, 0 @ 86981A4
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 226 @ 86981B0
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 195 @ 86981BC
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 195 @ 86981C8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 195 @ 86981C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86981D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86981E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86981EC
@@ -12192,8 +12192,8 @@ voicegroup112:: @ 8698654
voice_square_1 0, 2, 0, 0, 15, 0 @ 86988A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86988AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86988B8
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 128, 165, 128, 188 @ 86988C4
- voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_female_voice, 128, 165, 128, 204 @ 86988D0
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 128, 165, 128, 188 @ 86988C4
+ voice_directsound 60, 0, DirectSoundWaveData_unknown_female_voice, 128, 165, 128, 204 @ 86988D0
voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_male_voice, 128, 165, 128, 188 @ 86988DC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86988E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86988F4
@@ -12529,7 +12529,7 @@ voicegroup114:: @ 8699254
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699824
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699830
voice_square_1 0, 2, 0, 0, 15, 0 @ 869983C
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 8699848
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8699848
.align 2
voicegroup115:: @ 8699854
@@ -12537,8 +12537,8 @@ voicegroup115:: @ 8699854
voice_keysplit voicegroup005, KeySplitTable1 @ 8699860
voice_square_1 0, 2, 0, 0, 15, 0 @ 869986C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699878
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 128, 249, 0, 188 @ 8699884
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 188, 103, 165 @ 8699890
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 249, 0, 188 @ 8699884
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165 @ 8699890
voice_square_1 0, 2, 0, 0, 15, 0 @ 869989C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86998A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86998B4
@@ -12653,7 +12653,7 @@ voicegroup115:: @ 8699854
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DD0
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DDC
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699DE8
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 8699DF4
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8699DF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E00
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E0C
voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E18
@@ -13465,7 +13465,7 @@ voicegroup123:: @ 869BCF0
voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2CC
voice_square_1 0, 2, 0, 0, 15, 0 @ 869C2D8
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 869C2E4
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869C2E4
.align 2
voicegroup124:: @ 869C2F0
@@ -13772,8 +13772,8 @@ voicegroup126:: @ 869CAF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 869D0D0
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 216 @ 869D0DC
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 246, 0, 216 @ 869D0E8
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 216 @ 869D0DC
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869D0E8
.align 2
voicegroup127:: @ 869D0F4
@@ -13790,8 +13790,8 @@ voicegroup127:: @ 869D0F4
voice_square_1_alt 0, 2, 2, 0, 15, 0 @ 869D16C
voice_square_1_alt 0, 1, 2, 0, 15, 0 @ 869D178
voice_square_1_alt 23, 1, 0, 1, 9, 0 @ 869D184
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 165 @ 869D190
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 165 @ 869D19C
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 165 @ 869D190
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 165 @ 869D19C
voice_square_1_alt 0, 2, 0, 6, 0, 1 @ 869D1A8
voice_square_1_alt 36, 0, 0, 2, 0, 0 @ 869D1B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 869D1C0
@@ -13922,17 +13922,17 @@ voicegroup128:: @ 869D6F4
voice_noise_alt 1, 0, 2, 0, 0 @ 869D778
voice_square_1 103, 3, 2, 7, 0, 0 @ 869D784
voice_square_2 3, 2, 7, 0, 0 @ 869D790
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 127 @ 869D79C
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 869D79C
voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0 @ 869D7A8
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 204, 0, 127 @ 869D7B4
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 869D7B4
voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 869D7C0
voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127 @ 869D7CC
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 869D7D8
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 869D7D8
voice_square_1 103, 0, 0, 7, 0, 0 @ 869D7E4
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 127 @ 869D7F0
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 127 @ 869D7F0
voice_directsound 60, 0, DirectSoundWaveData_sc88_wind, 255, 0, 255, 127 @ 869D7FC
voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 869D808
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 127 @ 869D814
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 127 @ 869D814
voice_noise_alt 0, 0, 7, 15, 1 @ 869D820
voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127 @ 869D82C
voice_noise_alt 1, 0, 7, 15, 1 @ 869D838
@@ -13960,7 +13960,7 @@ voicegroup128:: @ 869D6F4
voice_square_1 0, 0, 4, 0, 15, 0 @ 869D940
voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 188, 0, 0 @ 869D94C
voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 226, 0, 127 @ 869D958
- voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_cymbal_crash, 26, 0, 255, 127 @ 869D964
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 26, 0, 255, 127 @ 869D964
voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 869D970
voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 252, 0, 127 @ 869D97C
voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 869D988
@@ -13975,7 +13975,7 @@ voicegroup128:: @ 869D6F4
voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 869D9F4
voice_directsound 60, 0, DirectSoundWaveData_unknown_tom, 255, 0, 255, 165 @ 869DA00
voice_noise_alt 0, 5, 7, 15, 1 @ 869DA0C
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 128, 242, 0, 165 @ 869DA18
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 128, 242, 0, 165 @ 869DA18
voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 165 @ 869DA24
voice_square_1 0, 0, 1, 5, 0, 0 @ 869DA30
voice_noise_alt 0, 6, 6, 0, 1 @ 869DA3C
@@ -14852,7 +14852,7 @@ voicegroup129:: @ 86A0154
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02A4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02BC
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A02C8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86A02C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A02EC
@@ -14869,7 +14869,7 @@ voicegroup129:: @ 86A0154
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0370
voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 86A037C
voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A0388
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 204, 0, 127 @ 86A0394
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 86A0394
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03A0
voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 86A03AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03B8
@@ -15435,7 +15435,7 @@ voicegroup133:: @ 86A1BB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D68
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D74
voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A1D80
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86A1D8C
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86A1D8C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1D98
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DA4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DB0
@@ -15516,7 +15516,7 @@ voicegroup133:: @ 86A1BB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2134
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2140
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A214C
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A2158
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86A2158
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2164
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2170
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A217C
@@ -15841,8 +15841,8 @@ voicegroup137:: @ 86A2FD4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FE0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2FF8
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 165, 180, 165 @ 86A3004
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 137, 154, 165 @ 86A3010
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165 @ 86A3004
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165 @ 86A3010
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A301C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3028
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3034
@@ -15972,8 +15972,8 @@ voicegroup138:: @ 86A35D4
voice_keysplit voicegroup005, KeySplitTable1 @ 86A35E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A35EC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A35F8
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86A3604
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86A3610
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86A3604
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 86A3610
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A361C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3628
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3634
@@ -16721,8 +16721,8 @@ voicegroup145:: @ 86A57F4
voice_keysplit voicegroup005, KeySplitTable1 @ 86A5800
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A580C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5818
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86A5824
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86A5830
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86A5824
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 86A5830
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A583C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5848
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5854
@@ -17079,7 +17079,7 @@ voicegroup148:: @ 86A67E4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A685C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6868
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6874
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 226, 0, 127 @ 86A6880
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 86A6880
voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A688C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6898
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A68A4
@@ -17105,7 +17105,7 @@ voicegroup148:: @ 86A67E4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6994
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69AC
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86A69B8
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86A69B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A69DC
@@ -17781,7 +17781,7 @@ voicegroup154:: @ 86A8860
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A886C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8878
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8884
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A8890
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86A8890
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A889C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A88B4
@@ -17877,8 +17877,8 @@ voicegroup155:: @ 86A8CBC
voice_keysplit voicegroup005, KeySplitTable1 @ 86A8CC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8CD4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8CE0
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A8CEC
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 255, 188, 103, 165 @ 86A8CF8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86A8CEC
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165 @ 86A8CF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D04
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D10
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D1C
@@ -17993,7 +17993,7 @@ voicegroup155:: @ 86A8CBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9238
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9244
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9250
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A925C
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86A925C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9268
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9274
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9280
@@ -18009,7 +18009,7 @@ voicegroup156:: @ 86A92BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A92D4
voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 86A92E0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A92EC
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A92F8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86A92F8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9304
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9310
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A931C
@@ -18124,7 +18124,7 @@ voicegroup156:: @ 86A92BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9838
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9844
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9850
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86A985C
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86A985C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9868
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9874
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9880
@@ -18270,7 +18270,7 @@ voicegroup158:: @ 86A9EBC
voice_keysplit voicegroup005, KeySplitTable1 @ 86A9EC8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9ED4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9EE0
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86A9EEC
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86A9EEC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9EF8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F04
voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9F10
@@ -18297,7 +18297,7 @@ voicegroup158:: @ 86A9EBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA00C
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86AA018
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86AA024
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86AA030
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86AA030
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA03C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA048
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA054
@@ -18305,7 +18305,7 @@ voicegroup158:: @ 86A9EBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA06C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA078
voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86AA084
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86AA090
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86AA090
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA09C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0B4
@@ -18319,7 +18319,7 @@ voicegroup158:: @ 86A9EBC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA114
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA120
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA12C
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 86AA138
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 86AA138
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA144
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA150
voice_keysplit voicegroup007, KeySplitTable3 @ 86AA15C
@@ -18401,8 +18401,8 @@ voicegroup159:: @ 86AA4BC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA4E0
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 64, 249, 0, 188 @ 86AA4EC
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 51, 249, 0, 165 @ 86AA4F8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 86AA4EC
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165 @ 86AA4F8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA504
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA510
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA51C
@@ -18754,7 +18754,7 @@ voicegroup162:: @ 86AB4DC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB4E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB4F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB500
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_high, 64, 188, 108, 244 @ 86AB50C
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244 @ 86AB50C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB518
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB524
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB530
@@ -18850,8 +18850,8 @@ voicegroup163:: @ 86AB938
voice_keysplit voicegroup005, KeySplitTable1 @ 86AB944
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB950
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB95C
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AB968
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AB974
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86AB968
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 86AB974
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB980
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB98C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB998
@@ -18981,8 +18981,8 @@ voicegroup164:: @ 86ABF38
voice_keysplit voicegroup005, KeySplitTable1 @ 86ABF44
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF50
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF5C
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 128, 180, 108, 209 @ 86ABF68
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 85, 204, 77, 246 @ 86ABF74
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209 @ 86ABF68
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246 @ 86ABF74
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF80
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF8C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABF98
@@ -19270,7 +19270,7 @@ voicegroup166:: @ 86ACB38
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACC88
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 86ACC94
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86ACCA0
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86ACCAC
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86ACCAC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCB8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCC4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCD0
@@ -19278,7 +19278,7 @@ voicegroup166:: @ 86ACB38
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCE8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACCF4
voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86ACD00
- voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_square, 255, 0, 255, 127 @ 86ACD0C
+ voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86ACD0C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD18
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD24
voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD30
@@ -19505,8 +19505,8 @@ voicegroup168:: @ 86AD738
voice_keysplit voicegroup005, KeySplitTable1 @ 86AD744
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD750
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD75C
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AD768
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AD774
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86AD768
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 86AD774
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD780
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD78C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD798
@@ -19948,8 +19948,8 @@ voicegroup172:: @ 86AEB6C
voice_keysplit voicegroup005, KeySplitTable1 @ 86AEB78
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEB84
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEB90
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AEB9C
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 255, 204, 77, 246 @ 86AEBA8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86AEB9C
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 86AEBA8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBB4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBC0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEBCC
@@ -20079,8 +20079,8 @@ voicegroup173:: @ 86AF16C
voice_keysplit voicegroup005, KeySplitTable1 @ 86AF178
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF184
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF190
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86AF19C
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86AF1A8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86AF19C
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 86AF1A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF1CC
@@ -20211,7 +20211,7 @@ voicegroup174:: @ 86AF76C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF784
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF790
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF79C
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86AF7A8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86AF7A8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7B4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF7CC
@@ -20326,7 +20326,7 @@ voicegroup174:: @ 86AF76C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFCE8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFCF4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD00
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86AFD0C
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86AFD0C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD18
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD24
voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFD30
@@ -20512,27 +20512,27 @@ voicegroup177:: @ 86B0378
voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 86B0534
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 86B0540
voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86B054C
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86B0558
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86B0558
voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0564
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0570
voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B057C
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86B0588
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86B0588
voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0594
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B05A0
voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05AC
voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05B8
- voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B05C4
+ voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05C4
voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86B05D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B05DC
- voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B05E8
+ voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05E8
voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86B05F4
voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B0600
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86B060C
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86B060C
voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B0618
- voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B0624
+ voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B0624
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0630
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B063C
- voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86B0648
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B063C
+ voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B0648
voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B0654
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B0660
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B066C
@@ -20751,8 +20751,8 @@ voicegroup180:: @ 86B0FF0
voice_keysplit voicegroup005, KeySplitTable1 @ 86B0FFC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1008
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1014
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 64, 249, 0, 188 @ 86B1020
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 249, 0, 165 @ 86B102C
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 86B1020
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 86B102C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1038
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1044
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1050
@@ -21181,7 +21181,7 @@ voicegroup184:: @ 86B2244
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2394
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23AC
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86B23B8
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86B23B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B23DC
@@ -21235,7 +21235,7 @@ voicegroup184:: @ 86B2244
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B261C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2628
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2634
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 255, 0, 255, 0 @ 86B2640
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 86B2640
.align 2
voicegroup185:: @ 86B264C
@@ -21270,7 +21270,7 @@ voicegroup185:: @ 86B264C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B279C
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 86B27A8
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 86B27B4
- voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_guitar_harmonics, 255, 0, 255, 165 @ 86B27C0
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86B27C0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B27CC
voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86B27D8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B27E4
@@ -21292,7 +21292,7 @@ voicegroup185:: @ 86B264C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28A4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28B0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28BC
- voice_directsound 60, 0, DirectSoundWaveData_advanced_orchestra_voice_ahhs, 85, 0, 154, 165 @ 86B28C8
+ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165 @ 86B28C8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28D4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28E0
voice_keysplit voicegroup007, KeySplitTable3 @ 86B28EC
@@ -21636,8 +21636,8 @@ voicegroup188:: @ 86B384C
voice_keysplit voicegroup005, KeySplitTable1 @ 86B3858
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3864
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3870
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86B387C
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86B3888
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86B387C
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 86B3888
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3894
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38A0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B38AC
@@ -21767,8 +21767,8 @@ voicegroup189:: @ 86B3E4C
voice_keysplit voicegroup005, KeySplitTable1 @ 86B3E58
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E64
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E70
- voice_directsound 60, 0, DirectSoundWaveData_unknown_e_piano_low, 255, 188, 128, 226 @ 86B3E7C
- voice_directsound 60, 65, DirectSoundWaveData_unknown_e_piano_high, 128, 204, 77, 246 @ 86B3E88
+ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 86B3E7C
+ voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 86B3E88
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3E94
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EA0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3EAC
@@ -21896,29 +21896,29 @@ voicegroup190:: @ 86B429C
voice_noise_alt 0, 0, 1, 9, 1 @ 86B4440
voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86B444C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4458
- voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88_standard_snare2, 255, 0, 255, 242 @ 86B4464
+ voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86B4464
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4470
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B447C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4488
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4494
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44A0
- voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_snare1, 255, 0, 255, 242 @ 86B44AC
+ voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86B44AC
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44B8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44C4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44D0
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44DC
- voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B44E8
+ voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B44E8
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B44F4
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4500
- voice_directsound 63, 64, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B450C
+ voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B450C
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4518
voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B4524
- voice_directsound_no_resample 64, 14, DirectSoundWaveData_unknown_cymbal_crash, 255, 231, 0, 188 @ 86B4530
+ voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86B4530
voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B453C
- voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B4548
+ voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4548
voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4554
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 255, 235, 0, 231 @ 86B4560
- voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_cymbal_crash, 8, 0, 255, 216 @ 86B456C
+ voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4560
+ voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B456C
voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B4578
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B4584
voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B4590
diff --git a/src/data/trade.h b/src/data/trade.h
index 4ed39f6cd..8601af2a8 100644
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -276,48 +276,65 @@ static const u8 sTradeMonSpriteCoords[(PARTY_SIZE * 2) + 1][2] =
{23, 18} // CANCEL
};
-static const u8 sTradeMonLevelCoords[][PARTY_SIZE][2] =
+static const u8 sTradeMonLevelCoords[][2][2] =
{
+ // Your party
{
- // Your party
{5, 4},
{12, 4},
+ },
+ {
{5, 9},
{12, 9},
+ },
+ {
{5, 14},
{12, 14},
},
+ // Friend's party
{
- // Friend's party
+
{20, 4},
{27, 4},
+ },
+ {
{20, 9},
{27, 9},
+ },
+ {
{20, 14},
- {27, 14}
- }
+ {27, 14},
+ },
};
-static const u8 sTradeMonBoxCoords[][PARTY_SIZE][2] =
+static const u8 sTradeMonBoxCoords[][2][2] =
{
+ // Your party
{
- // Your party
{1, 3},
{8, 3},
+ },
+ {
{1, 8},
{8, 8},
+ },
+ {
{1, 13},
{8, 13},
},
+ // Friend's party
{
- // Friend's party
{16, 3},
{23, 3},
+ },
+ {
{16, 8},
{23, 8},
+ },
+ {
{16, 13},
- {23, 13}
- }
+ {23, 13},
+ },
};
static const u8 sUnref_0832DE6E[] =
diff --git a/src/trade.c b/src/trade.c
index 91b514067..bec2f0487 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1988,73 +1988,28 @@ static void DrawTradeMenuPartyMonInfo(u8 whichParty, u8 monIdx, u8 x, u8 y, u8 w
sTradeMenuData->tilemapBuffer[(y - 1) * 32 + x + 1] = symbolTile;
}
-// Very close but loop preamble not working.
-#ifdef NONMATCHING
static void DrawTradeMenuPartyInfo(u8 whichParty)
{
- int i;
-
+ s32 i;
for (i = 0; i < sTradeMenuData->partyCounts[whichParty]; i++)
{
- DrawTradeMenuPartyMonInfo(whichParty, i,
- sTradeMonLevelCoords[whichParty][i][0],
- sTradeMonLevelCoords[whichParty][i][1],
- sTradeMonBoxCoords[whichParty][i][0],
- sTradeMonBoxCoords[whichParty][i][1]);
+ const u8 (*r5)[2];
+ const u8 (*r4)[2];
+ u32 r0 = 3 * whichParty;
+ const u8 (*r1)[2][2] = sTradeMonLevelCoords;
+
+ r5 = r1[r0];
+ r4 = sTradeMonBoxCoords[r0];
+ DrawTradeMenuPartyMonInfo(
+ whichParty,
+ i,
+ r5[i][0],
+ r5[i][1],
+ r4[i][0],
+ r4[i][1]
+ );
}
}
-#else
-NAKED
-static void DrawTradeMenuPartyInfo(u8 whichParty)
-{
- asm_unified("push {r4-r7,lr}\n\
- sub sp, 0x8\n\
- lsls r0, 24\n\
- lsrs r6, r0, 24\n\
- movs r7, 0\n\
- ldr r0, =sTradeMenuData\n\
- ldr r0, [r0]\n\
- adds r0, 0x36\n\
- adds r0, r6\n\
- ldrb r0, [r0]\n\
- cmp r7, r0\n\
- bge _08079E94\n\
- lsls r0, r6, 1\n\
- adds r0, r6\n\
- ldr r1, =sTradeMonLevelCoords\n\
- lsls r0, 2\n\
- adds r5, r0, r1\n\
- ldr r1, =sTradeMonBoxCoords\n\
- adds r4, r0, r1\n\
-_08079E6A:\n\
- lsls r1, r7, 24\n\
- lsrs r1, 24\n\
- ldrb r2, [r5]\n\
- ldrb r3, [r5, 0x1]\n\
- ldrb r0, [r4]\n\
- str r0, [sp]\n\
- ldrb r0, [r4, 0x1]\n\
- str r0, [sp, 0x4]\n\
- adds r0, r6, 0\n\
- bl DrawTradeMenuPartyMonInfo\n\
- adds r5, 0x2\n\
- adds r4, 0x2\n\
- adds r7, 0x1\n\
- ldr r0, =sTradeMenuData\n\
- ldr r0, [r0]\n\
- adds r0, 0x36\n\
- adds r0, r6\n\
- ldrb r0, [r0]\n\
- cmp r7, r0\n\
- blt _08079E6A\n\
-_08079E94:\n\
- add sp, 0x8\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .pool");
-}
-#endif // NONMATCHING
static void ResetTradeMenuPartyPositions(u8 whichParty)
{
@@ -2541,10 +2496,8 @@ int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuP
return CANT_REGISTER_MON;
}
-// r6/r7 flip. Ugh.
// Spin Trade wasnt fully implemented, but this checks if a mon would be valid to Spin Trade
// Unlike later generations, this version of Spin Trade isnt only for Eggs
-#ifdef NONMATCHING
int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx)
{
int i, version, versions, canTradeAnyMon, numMonsLeft;
@@ -2560,8 +2513,8 @@ int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx)
}
}
- canTradeAnyMon = TRUE;
versions = 0;
+ canTradeAnyMon = TRUE;
for (i = 0; i < GetLinkPlayerCount(); i++)
{
version = gLinkPlayers[i].version & 0xFF;
@@ -2581,11 +2534,14 @@ int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx)
struct LinkPlayer *player = &gLinkPlayers[i];
// Does player not have National Dex
- if (!(player->progressFlags & 0xF))
- canTradeAnyMon = FALSE;
+ do
+ {
+ if (!(player->progressFlags & 0xF))
+ canTradeAnyMon = FALSE;
- if (versions && (player->progressFlags / 16))
- canTradeAnyMon = FALSE;
+ if (versions && (player->progressFlags / 16))
+ canTradeAnyMon = FALSE;
+ } while (0);
}
if (canTradeAnyMon == FALSE)
@@ -2611,154 +2567,6 @@ int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx)
else
return CAN_TRADE_MON;
}
-#else
-NAKED
-int CanSpinTradeMon(struct Pokemon *mon, u16 a1)
-{
- asm_unified("push {r4-r7,lr}\n\
- mov r7, r8\n\
- push {r7}\n\
- sub sp, 0x18\n\
- adds r6, r0, 0\n\
- lsls r1, 16\n\
- lsrs r1, 16\n\
- mov r8, r1\n\
- movs r5, 0\n\
- ldr r0, =gPlayerPartyCount\n\
- ldrb r0, [r0]\n\
- cmp r5, r0\n\
- bge _0807A95A\n\
- mov r4, sp\n\
-_0807A934:\n\
- movs r0, 0x64\n\
- muls r0, r5\n\
- adds r0, r6, r0\n\
- movs r1, 0x41\n\
- bl GetMonData\n\
- str r0, [r4]\n\
- movs r1, 0xCE\n\
- lsls r1, 1\n\
- cmp r0, r1\n\
- bne _0807A94E\n\
- movs r0, 0\n\
- str r0, [r4]\n\
-_0807A94E:\n\
- adds r4, 0x4\n\
- adds r5, 0x1\n\
- ldr r0, =gPlayerPartyCount\n\
- ldrb r0, [r0]\n\
- cmp r5, r0\n\
- blt _0807A934\n\
-_0807A95A:\n\
- movs r7, 0\n\
- movs r6, 0x1\n\
- movs r5, 0\n\
- ldr r4, =gLinkPlayers\n\
- b _0807A980\n\
- .pool\n\
-_0807A96C:\n\
- ldrb r0, [r4]\n\
- subs r0, 0x4\n\
- cmp r0, 0x1\n\
- bhi _0807A978\n\
- movs r7, 0\n\
- b _0807A97C\n\
-_0807A978:\n\
- movs r0, 0x1\n\
- orrs r7, r0\n\
-_0807A97C:\n\
- adds r4, 0x1C\n\
- adds r5, 0x1\n\
-_0807A980:\n\
- bl GetLinkPlayerCount\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- cmp r5, r0\n\
- blt _0807A96C\n\
- movs r5, 0\n\
- movs r4, 0\n\
- b _0807A9B4\n\
-_0807A992:\n\
- ldr r0, =gLinkPlayers\n\
- adds r2, r4, r0\n\
- ldrb r1, [r2, 0x10]\n\
- movs r0, 0xF\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- bne _0807A9A2\n\
- movs r6, 0\n\
-_0807A9A2:\n\
- cmp r7, 0\n\
- beq _0807A9B0\n\
- ldrb r0, [r2, 0x10]\n\
- lsrs r0, 4\n\
- cmp r0, 0\n\
- beq _0807A9B0\n\
- movs r6, 0\n\
-_0807A9B0:\n\
- adds r4, 0x1C\n\
- adds r5, 0x1\n\
-_0807A9B4:\n\
- bl GetLinkPlayerCount\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- cmp r5, r0\n\
- blt _0807A992\n\
- cmp r6, 0\n\
- bne _0807A9EA\n\
- mov r1, r8\n\
- lsls r0, r1, 2\n\
- mov r1, sp\n\
- adds r4, r1, r0\n\
- ldrh r0, [r4]\n\
- bl IsSpeciesInHoennDex\n\
- cmp r0, 0\n\
- bne _0807A9E0\n\
- movs r0, 0x2\n\
- b _0807AA1A\n\
- .pool\n\
-_0807A9E0:\n\
- ldr r0, [r4]\n\
- cmp r0, 0\n\
- bne _0807A9EA\n\
- movs r0, 0x3\n\
- b _0807AA1A\n\
-_0807A9EA:\n\
- movs r2, 0\n\
- movs r5, 0\n\
- ldr r0, =gPlayerPartyCount\n\
- ldrb r0, [r0]\n\
- cmp r2, r0\n\
- bge _0807AA0A\n\
- adds r3, r0, 0\n\
- mov r1, sp\n\
-_0807A9FA:\n\
- cmp r8, r5\n\
- beq _0807AA02\n\
- ldr r0, [r1]\n\
- adds r2, r0\n\
-_0807AA02:\n\
- adds r1, 0x4\n\
- adds r5, 0x1\n\
- cmp r5, r3\n\
- blt _0807A9FA\n\
-_0807AA0A:\n\
- cmp r2, 0\n\
- beq _0807AA18\n\
- movs r0, 0\n\
- b _0807AA1A\n\
- .pool\n\
-_0807AA18:\n\
- movs r0, 0x1\n\
-_0807AA1A:\n\
- add sp, 0x18\n\
- pop {r3}\n\
- mov r8, r3\n\
- pop {r4-r7}\n\
- pop {r1}\n\
- bx r1");
-}
-#endif // NONMATCHING
static void sub_807AA28(struct Sprite *sprite)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 08:47:57 +0000