Merge pull request #577 from GriffinRichards/sync-misc2
Sync trainer_pokemon_sprites, programmable_wave_data, and battle_bg
This commit is contained in:
GriffinR
@@ -1,33 +1,32 @@
|
||||
ProgrammableWaveData_1::
|
||||
.incbin "sound/programmable_wave_samples/01.pcm"
|
||||
|
||||
gProgrammableWaveData_84A31EC::
|
||||
.incbin "sound/programmable_wave_samples/84A31EC.pcm"
|
||||
ProgrammableWaveData_2::
|
||||
.incbin "sound/programmable_wave_samples/02.pcm"
|
||||
|
||||
gProgrammableWaveData_84A31FC::
|
||||
.incbin "sound/programmable_wave_samples/84A31FC.pcm"
|
||||
ProgrammableWaveData_3::
|
||||
.incbin "sound/programmable_wave_samples/03.pcm"
|
||||
|
||||
gProgrammableWaveData_84A320C::
|
||||
.incbin "sound/programmable_wave_samples/84A320C.pcm"
|
||||
ProgrammableWaveData_4::
|
||||
.incbin "sound/programmable_wave_samples/04.pcm"
|
||||
|
||||
gProgrammableWaveData_84A321C::
|
||||
.incbin "sound/programmable_wave_samples/84A321C.pcm"
|
||||
ProgrammableWaveData_5::
|
||||
.incbin "sound/programmable_wave_samples/05.pcm"
|
||||
|
||||
gProgrammableWaveData_84A322C::
|
||||
.incbin "sound/programmable_wave_samples/84A322C.pcm"
|
||||
ProgrammableWaveData_6::
|
||||
.incbin "sound/programmable_wave_samples/06.pcm"
|
||||
|
||||
gProgrammableWaveData_84A323C::
|
||||
.incbin "sound/programmable_wave_samples/84A323C.pcm"
|
||||
ProgrammableWaveData_7::
|
||||
.incbin "sound/programmable_wave_samples/07.pcm"
|
||||
|
||||
gProgrammableWaveData_84A324C::
|
||||
.incbin "sound/programmable_wave_samples/84A324C.pcm"
|
||||
ProgrammableWaveData_8::
|
||||
.incbin "sound/programmable_wave_samples/08.pcm"
|
||||
|
||||
gProgrammableWaveData_84A325C::
|
||||
.incbin "sound/programmable_wave_samples/84A325C.pcm"
|
||||
ProgrammableWaveData_9::
|
||||
.incbin "sound/programmable_wave_samples/09.pcm"
|
||||
|
||||
gProgrammableWaveData_84A326C::
|
||||
.incbin "sound/programmable_wave_samples/84A326C.pcm"
|
||||
ProgrammableWaveData_10::
|
||||
.incbin "sound/programmable_wave_samples/10.pcm"
|
||||
|
||||
gProgrammableWaveData_84A327C::
|
||||
.incbin "sound/programmable_wave_samples/84A327C.pcm"
|
||||
|
||||
gProgrammableWaveData_84A328C::
|
||||
.incbin "sound/programmable_wave_samples/84A328C.pcm"
|
||||
ProgrammableWaveData_11::
|
||||
.incbin "sound/programmable_wave_samples/11.pcm"
|
||||
|
||||
+88
-88
@@ -76,7 +76,7 @@ voicegroup001::
|
||||
voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1
|
||||
voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -84,7 +84,7 @@ voicegroup001::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2 60, 0, 2, 0, 1, 6, 0
|
||||
voice_programmable_wave 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1
|
||||
voice_programmable_wave 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
|
||||
voice_square_2 60, 0, 3, 0, 1, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -434,8 +434,8 @@ voicegroup008::
|
||||
voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2 60, 0, 2, 0, 1, 4, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 1, 4, 1
|
||||
@@ -533,7 +533,7 @@ voicegroup009::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 2, 0, 1, 9, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
|
||||
voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
|
||||
@@ -621,7 +621,7 @@ voicegroup010::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2 60, 0, 2, 0, 1, 7, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 7, 1
|
||||
voice_square_2 60, 0, 3, 0, 1, 7, 1
|
||||
@@ -630,7 +630,7 @@ voicegroup010::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
|
||||
|
||||
.align 2
|
||||
voicegroup011::
|
||||
@@ -715,7 +715,7 @@ voicegroup011::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2 60, 0, 2, 0, 1, 7, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
|
||||
voice_square_2 60, 0, 1, 0, 1, 9, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -724,7 +724,7 @@ voicegroup011::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
|
||||
|
||||
.align 2
|
||||
voicegroup012::
|
||||
@@ -1351,7 +1351,7 @@ voicegroup131::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 9, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 9, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -1472,9 +1472,9 @@ voicegroup132::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 7, 5
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 4, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_11, 0, 4, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2
|
||||
@@ -1482,7 +1482,7 @@ voicegroup132::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 2, 9, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -1608,12 +1608,12 @@ voicegroup133::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -1739,7 +1739,7 @@ voicegroup134::
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
|
||||
voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
|
||||
voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1
|
||||
|
||||
@@ -1917,8 +1917,8 @@ voicegroup136::
|
||||
voice_square_2_alt 60, 0, 0, 0, 5, 0, 0
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0
|
||||
voice_square_2_alt 60, 0, 3, 2, 4, 10, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 1, 5, 0, 3
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 1, 5, 0, 3
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 1, 5, 0, 3
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 1, 5, 0, 3
|
||||
voice_square_2_alt 60, 0, 1, 0, 1, 10, 2
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2049,8 +2049,8 @@ voicegroup137::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 2, 4, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 2, 4, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 2, 4, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 2, 4, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2185,7 +2185,7 @@ voicegroup138::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2316,7 +2316,7 @@ voicegroup139::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2358,7 +2358,7 @@ voicegroup140::
|
||||
voice_keysplit_all voicegroup001
|
||||
voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup141::
|
||||
@@ -2445,9 +2445,9 @@ voicegroup141::
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
|
||||
voice_square_2_alt 60, 0, 3, 0, 2, 7, 3
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 1, 7, 0, 6
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 2, 9, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 2, 9, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2576,7 +2576,7 @@ voicegroup142::
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 5, 5
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup143::
|
||||
@@ -2663,7 +2663,7 @@ voicegroup143::
|
||||
voice_square_2_alt 60, 0, 3, 0, 2, 3, 2
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2794,7 +2794,7 @@ voicegroup144::
|
||||
voice_square_2_alt 60, 0, 3, 0, 2, 4, 2
|
||||
voice_square_2_alt 60, 0, 1, 0, 2, 4, 3
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -2934,7 +2934,7 @@ voicegroup145::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3065,7 +3065,7 @@ voicegroup146::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3187,7 +3187,7 @@ voicegroup147::
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 0, 6, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 2, 4, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 2, 4, 2
|
||||
|
||||
.align 2
|
||||
voicegroup148::
|
||||
@@ -3278,7 +3278,7 @@ voicegroup148::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3409,12 +3409,12 @@ voicegroup149::
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup150::
|
||||
@@ -3501,7 +3501,7 @@ voicegroup150::
|
||||
voice_square_2_alt 60, 0, 1, 0, 1, 4, 6
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3636,7 +3636,7 @@ voicegroup151::
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup152::
|
||||
@@ -3722,9 +3722,9 @@ voicegroup152::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 5, 2
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 4, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_11, 0, 4, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1
|
||||
@@ -3732,7 +3732,7 @@ voicegroup152::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 2, 9, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3863,7 +3863,7 @@ voicegroup153::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A325C, 0, 1, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_8, 0, 1, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -3989,12 +3989,12 @@ voicegroup154::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A321C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 0, 12, 0
|
||||
|
||||
.align 2
|
||||
voicegroup155::
|
||||
@@ -4081,13 +4081,13 @@ voicegroup155::
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
|
||||
voice_square_2_alt 60, 0, 3, 0, 3, 6, 2
|
||||
voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 3, 6, 5
|
||||
voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 1, 9, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_10, 0, 1, 9, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
|
||||
@@ -4132,7 +4132,7 @@ voicegroup156::
|
||||
voice_keysplit_all voicegroup002
|
||||
voice_keysplit voicegroup003, KeySplitTable1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -4342,12 +4342,12 @@ voicegroup157::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
|
||||
voice_square_2_alt 60, 0, 3, 0, 3, 3, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 3, 6, 5
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -4475,15 +4475,15 @@ voicegroup158::
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 10, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 2, 1, 0, 9, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -4604,7 +4604,7 @@ voicegroup159::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6
|
||||
voice_square_2_alt 60, 0, 1, 1, 5, 1, 6
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 1, 7, 0, 6
|
||||
voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -4740,7 +4740,7 @@ voicegroup160::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup161::
|
||||
@@ -4831,7 +4831,7 @@ voicegroup161::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -4967,7 +4967,7 @@ voicegroup162::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup163::
|
||||
@@ -5063,7 +5063,7 @@ voicegroup163::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5184,7 +5184,7 @@ voicegroup164::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 6, 2
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_11, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5194,7 +5194,7 @@ voicegroup164::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5325,7 +5325,7 @@ voicegroup165::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5451,12 +5451,12 @@ voicegroup166::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5579,7 +5579,7 @@ voicegroup167::
|
||||
voice_square_2_alt 60, 0, 3, 0, 2, 8, 3
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 6, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 0, 6, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5718,7 +5718,7 @@ voicegroup168::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5832,7 +5832,7 @@ voicegroup169::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -5969,7 +5969,7 @@ voicegroup170::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
|
||||
voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 1, 0, 0
|
||||
|
||||
@@ -6056,7 +6056,7 @@ voicegroup171::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
|
||||
voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
|
||||
@@ -6064,8 +6064,8 @@ voicegroup171::
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
|
||||
voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
|
||||
|
||||
.align 2
|
||||
voicegroup172::
|
||||
@@ -6161,7 +6161,7 @@ voicegroup172::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -6292,7 +6292,7 @@ voicegroup173::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -6423,7 +6423,7 @@ voicegroup174::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -6462,7 +6462,7 @@ voicegroup174::
|
||||
voice_keysplit_all voicegroup177
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 9, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -6487,7 +6487,7 @@ voicegroup174::
|
||||
voice_keysplit_all voicegroup002
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup175::
|
||||
@@ -6581,7 +6581,7 @@ voicegroup176::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -6777,7 +6777,7 @@ voicegroup178::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 15, 1
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 0, 15, 1
|
||||
|
||||
.align 2
|
||||
voicegroup179::
|
||||
@@ -6868,7 +6868,7 @@ voicegroup179::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup180::
|
||||
@@ -6964,7 +6964,7 @@ voicegroup180::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7140,7 +7140,7 @@ voicegroup182::
|
||||
voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
|
||||
.align 2
|
||||
voicegroup183::
|
||||
@@ -7227,7 +7227,7 @@ voicegroup183::
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
|
||||
voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7278,7 +7278,7 @@ voicegroup184::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7448,10 +7448,10 @@ voicegroup185::
|
||||
voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_11, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_10, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7718,7 +7718,7 @@ voicegroup187::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7849,7 +7849,7 @@ voicegroup188::
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
@@ -7983,7 +7983,7 @@ voicegroup189::
|
||||
|
||||
.align 2
|
||||
voicegroup190::
|
||||
voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2
|
||||
voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 2
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
|
||||
|
||||
+65
-40
@@ -28,9 +28,9 @@ struct BattleBackground
|
||||
static void CB2_unused(void);
|
||||
static u8 GetBattleTerrainOverride(void);
|
||||
|
||||
static const u8 gUnknown_824829C[] = {1, 2};
|
||||
static const u8 sUnused[] = {1, 2};
|
||||
|
||||
static const struct OamData gOamData_82482A0 = {
|
||||
static const struct OamData sVsLetter_V_OamData = {
|
||||
.y = 0,
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
@@ -46,7 +46,7 @@ static const struct OamData gOamData_82482A0 = {
|
||||
.affineParam = 0
|
||||
};
|
||||
|
||||
static const struct OamData gOamData_82482A8 = {
|
||||
static const struct OamData sVsLetter_S_OamData = {
|
||||
.y = 0,
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
@@ -62,38 +62,38 @@ static const struct OamData gOamData_82482A8 = {
|
||||
.affineParam = 0
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gUnknown_82482B0[] = {
|
||||
static const union AffineAnimCmd sVsLetterAffineAnimCmds0[] = {
|
||||
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
|
||||
AFFINEANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gUnknown_82482C0[] = {
|
||||
static const union AffineAnimCmd sVsLetterAffineAnimCmds1[] = {
|
||||
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
|
||||
AFFINEANIMCMD_FRAME(0x18, 0x18, 0x0, 0x80),
|
||||
AFFINEANIMCMD_FRAME(0x18, 0x18, 0x0, 0x80),
|
||||
AFFINEANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd *const gAffineAnimTable_82482E0[] = {
|
||||
gUnknown_82482B0,
|
||||
gUnknown_82482C0
|
||||
static const union AffineAnimCmd *const sVsLetterAffineAnimTable[] = {
|
||||
sVsLetterAffineAnimCmds0,
|
||||
sVsLetterAffineAnimCmds1
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sVsLetter_V_SpriteTemplate = {
|
||||
.tileTag = TAG_VS_LETTERS,
|
||||
.paletteTag = TAG_VS_LETTERS,
|
||||
.oam = &gOamData_82482A0,
|
||||
.oam = &sVsLetter_V_OamData,
|
||||
.anims = gDummySpriteAnimTable,
|
||||
.affineAnims = gAffineAnimTable_82482E0,
|
||||
.affineAnims = sVsLetterAffineAnimTable,
|
||||
.callback = SpriteCB_VsLetterDummy
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sVsLetter_S_SpriteTemplate = {
|
||||
.tileTag = TAG_VS_LETTERS,
|
||||
.paletteTag = TAG_VS_LETTERS,
|
||||
.oam = &gOamData_82482A8,
|
||||
.oam = &sVsLetter_S_OamData,
|
||||
.anims = gDummySpriteAnimTable,
|
||||
.affineAnims = gAffineAnimTable_82482E0,
|
||||
.affineAnims = sVsLetterAffineAnimTable,
|
||||
.callback = SpriteCB_VsLetterDummy
|
||||
};
|
||||
|
||||
@@ -139,8 +139,8 @@ const struct BgTemplate gBattleBgTemplates[4] = {
|
||||
}
|
||||
};
|
||||
|
||||
static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
{
|
||||
static const struct WindowTemplate sStandardBattleWindowTemplates[] = {
|
||||
[B_WIN_MSG] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 15,
|
||||
@@ -148,7 +148,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 0,
|
||||
.baseBlock = 0x090
|
||||
}, {
|
||||
},
|
||||
[B_WIN_ACTION_PROMPT] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 35,
|
||||
@@ -156,7 +157,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 0,
|
||||
.baseBlock = 0x1c0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_ACTION_MENU] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 17,
|
||||
.tilemapTop = 35,
|
||||
@@ -164,7 +166,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x190
|
||||
}, {
|
||||
},
|
||||
[B_WIN_MOVE_NAME_1] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 55,
|
||||
@@ -172,7 +175,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x300
|
||||
}, {
|
||||
},
|
||||
[B_WIN_MOVE_NAME_2] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 11,
|
||||
.tilemapTop = 55,
|
||||
@@ -180,7 +184,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x310
|
||||
}, {
|
||||
},
|
||||
[B_WIN_MOVE_NAME_3] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 57,
|
||||
@@ -188,7 +193,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x320
|
||||
}, {
|
||||
},
|
||||
[B_WIN_MOVE_NAME_4] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 11,
|
||||
.tilemapTop = 57,
|
||||
@@ -196,7 +202,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x330
|
||||
}, {
|
||||
},
|
||||
[B_WIN_PP] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 21,
|
||||
.tilemapTop = 55,
|
||||
@@ -204,7 +211,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x290
|
||||
}, {
|
||||
},
|
||||
[B_WIN_MOVE_TYPE] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 21,
|
||||
.tilemapTop = 57,
|
||||
@@ -212,7 +220,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x296
|
||||
}, {
|
||||
},
|
||||
[B_WIN_PP_REMAINING] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 24,
|
||||
.tilemapTop = 55,
|
||||
@@ -220,7 +229,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x2a6
|
||||
}, {
|
||||
},
|
||||
[B_WIN_DUMMY] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 25,
|
||||
.tilemapTop = 57,
|
||||
@@ -228,7 +238,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 0,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x2b0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_SWITCH_PROMPT] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 21,
|
||||
.tilemapTop = 55,
|
||||
@@ -236,7 +247,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x2b0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_LEVEL_UP_BOX] = {
|
||||
.bg = 1,
|
||||
.tilemapLeft = 19,
|
||||
.tilemapTop = 8,
|
||||
@@ -244,7 +256,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 11,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x100
|
||||
}, {
|
||||
},
|
||||
[B_WIN_LEVEL_UP_BANNER] = {
|
||||
.bg = 2,
|
||||
.tilemapLeft = 18,
|
||||
.tilemapTop = 0,
|
||||
@@ -252,7 +265,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 3,
|
||||
.paletteNum = 6,
|
||||
.baseBlock = 0x16e
|
||||
}, {
|
||||
},
|
||||
[B_WIN_YESNO] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 25,
|
||||
.tilemapTop = 9,
|
||||
@@ -260,7 +274,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x100
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_PLAYER] = {
|
||||
.bg = 1,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 3,
|
||||
@@ -268,7 +283,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x020
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_OPPONENT] = {
|
||||
.bg = 2,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 3,
|
||||
@@ -276,7 +292,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x040
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_MULTI_PLAYER_1] = {
|
||||
.bg = 1,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 2,
|
||||
@@ -284,7 +301,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x020
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_MULTI_PLAYER_2] = {
|
||||
.bg = 2,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 2,
|
||||
@@ -292,7 +310,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x040
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_MULTI_PLAYER_3] = {
|
||||
.bg = 1,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 6,
|
||||
@@ -300,7 +319,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x060
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_MULTI_PLAYER_4] = {
|
||||
.bg = 2,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 6,
|
||||
@@ -308,7 +328,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 5,
|
||||
.baseBlock = 0x080
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_OUTCOME_DRAW] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 11,
|
||||
.tilemapTop = 2,
|
||||
@@ -316,7 +337,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 0,
|
||||
.baseBlock = 0x0a0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_OUTCOME_LEFT] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 4,
|
||||
.tilemapTop = 2,
|
||||
@@ -324,7 +346,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 0,
|
||||
.baseBlock = 0x0a0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_VS_OUTCOME_RIGHT] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 19,
|
||||
.tilemapTop = 2,
|
||||
@@ -332,7 +355,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 2,
|
||||
.paletteNum = 0,
|
||||
.baseBlock = 0x0b0
|
||||
}, {
|
||||
},
|
||||
[B_WIN_OAK_OLD_MAN] = {
|
||||
.bg = 0,
|
||||
.tilemapLeft = 2,
|
||||
.tilemapTop = 15,
|
||||
@@ -340,7 +364,8 @@ static const struct WindowTemplate gUnknown_8248330[] = {
|
||||
.height = 4,
|
||||
.paletteNum = 7,
|
||||
.baseBlock = 0x090
|
||||
}, DUMMY_WIN_TEMPLATE
|
||||
},
|
||||
DUMMY_WIN_TEMPLATE
|
||||
};
|
||||
|
||||
static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.gbapal.lz");
|
||||
@@ -649,7 +674,7 @@ void BattleInitBgsAndWindows(void)
|
||||
{
|
||||
ResetBgsAndClearDma3BusyFlags(FALSE);
|
||||
InitBgsFromTemplates(0, gBattleBgTemplates, NELEMS(gBattleBgTemplates));
|
||||
InitWindows(gUnknown_8248330);
|
||||
InitWindows(sStandardBattleWindowTemplates);
|
||||
DeactivateAllTextPrinters();
|
||||
}
|
||||
|
||||
|
||||
@@ -12,26 +12,19 @@ struct PicData
|
||||
u8 active;
|
||||
};
|
||||
|
||||
// Static RAM declarations
|
||||
#define PICS_COUNT 8
|
||||
|
||||
static EWRAM_DATA struct SpriteTemplate sCreatingSpriteTemplate = {};
|
||||
static EWRAM_DATA struct PicData sSpritePics[PICS_COUNT] = {};
|
||||
|
||||
// Static ROM declarations
|
||||
static const struct PicData sDummyPicData = {};
|
||||
|
||||
// .rodata
|
||||
|
||||
static const struct PicData gUnknown_8453178 = {};
|
||||
|
||||
static const struct OamData gUnknown_8453184 =
|
||||
static const struct OamData sOamData_Normal =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64)
|
||||
};
|
||||
|
||||
// .text
|
||||
|
||||
void DummyPicSpriteCallback(struct Sprite *sprite)
|
||||
{
|
||||
|
||||
@@ -42,7 +35,7 @@ bool16 ResetAllPicSprites(void)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < PICS_COUNT; i ++)
|
||||
sSpritePics[i] = gUnknown_8453178;
|
||||
sSpritePics[i] = sDummyPicData;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@@ -85,9 +78,9 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett
|
||||
{
|
||||
if (!isTrainer)
|
||||
{
|
||||
if (paletteTag == 0xFFFF)
|
||||
if (paletteTag == TAG_NONE)
|
||||
{
|
||||
sCreatingSpriteTemplate.paletteTag = 0xFFFF;
|
||||
sCreatingSpriteTemplate.paletteTag = TAG_NONE;
|
||||
LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
|
||||
}
|
||||
else
|
||||
@@ -98,9 +91,9 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett
|
||||
}
|
||||
else
|
||||
{
|
||||
if (paletteTag == 0xFFFF)
|
||||
if (paletteTag == TAG_NONE)
|
||||
{
|
||||
sCreatingSpriteTemplate.paletteTag = 0xFFFF;
|
||||
sCreatingSpriteTemplate.paletteTag = TAG_NONE;
|
||||
LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
|
||||
}
|
||||
else
|
||||
@@ -138,19 +131,15 @@ u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s1
|
||||
for (i = 0; i < PICS_COUNT; i ++)
|
||||
{
|
||||
if (!sSpritePics[i].active)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == PICS_COUNT)
|
||||
{
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
framePics = Alloc(4 * 0x800);
|
||||
if (!framePics)
|
||||
{
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
images = Alloc(4 * sizeof(struct SpriteFrameImage));
|
||||
if (!images)
|
||||
{
|
||||
@@ -167,18 +156,16 @@ u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s1
|
||||
images[j].data = framePics + 0x800 * j;
|
||||
images[j].size = 0x800;
|
||||
}
|
||||
sCreatingSpriteTemplate.tileTag = 0xFFFF;
|
||||
sCreatingSpriteTemplate.oam = &gUnknown_8453184;
|
||||
sCreatingSpriteTemplate.tileTag = TAG_NONE;
|
||||
sCreatingSpriteTemplate.oam = &sOamData_Normal;
|
||||
AssignSpriteAnimsTable(isTrainer);
|
||||
sCreatingSpriteTemplate.images = images;
|
||||
sCreatingSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||
sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
|
||||
LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer);
|
||||
spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
|
||||
if (paletteTag == 0xFFFF)
|
||||
{
|
||||
if (paletteTag == TAG_NONE)
|
||||
gSprites[spriteId].oam.paletteNum = paletteSlot;
|
||||
}
|
||||
sSpritePics[i].frames = framePics;
|
||||
sSpritePics[i].images = images;
|
||||
sSpritePics[i].paletteTag = paletteTag;
|
||||
@@ -201,33 +188,27 @@ u16 FreeAndDestroyPicSpriteInternal(u16 spriteId)
|
||||
for (i = 0; i < PICS_COUNT; i ++)
|
||||
{
|
||||
if (sSpritePics[i].spriteId == spriteId)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == PICS_COUNT)
|
||||
{
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
framePics = sSpritePics[i].frames;
|
||||
images = sSpritePics[i].images;
|
||||
if (sSpritePics[i].paletteTag != 0xFFFF)
|
||||
{
|
||||
if (sSpritePics[i].paletteTag != TAG_NONE)
|
||||
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
|
||||
}
|
||||
DestroySprite(&gSprites[spriteId]);
|
||||
Free(framePics);
|
||||
Free(images);
|
||||
sSpritePics[i] = gUnknown_8453178;
|
||||
sSpritePics[i] = sDummyPicData;
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 sub_810C050(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
|
||||
static u16 LoadPicSpriteInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
|
||||
{
|
||||
if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
|
||||
{
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer);
|
||||
return 0;
|
||||
}
|
||||
@@ -282,9 +263,9 @@ u16 FreeAndDestroyTrainerPicSprite(u16 spriteId)
|
||||
return FreeAndDestroyPicSpriteInternal(spriteId);
|
||||
}
|
||||
|
||||
u16 sub_810C2FC(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
|
||||
u16 LoadTrainerPicInWindow(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
|
||||
{
|
||||
return sub_810C050(species, 0, 0, isFrontPic, paletteSlot, windowId, TRUE);
|
||||
return LoadPicSpriteInWindow(species, 0, 0, isFrontPic, paletteSlot, windowId, TRUE);
|
||||
}
|
||||
|
||||
u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
|
||||
@@ -296,13 +277,10 @@ u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass)
|
||||
{
|
||||
if (getClass == TRUE)
|
||||
{
|
||||
switch (gender)
|
||||
{
|
||||
default:
|
||||
return gFacilityClassToPicIndex[0x87];
|
||||
case MALE:
|
||||
return gFacilityClassToPicIndex[0x86];
|
||||
}
|
||||
if (gender != MALE)
|
||||
return gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
|
||||
else
|
||||
return gFacilityClassToPicIndex[FACILITY_CLASS_RED];
|
||||
}
|
||||
return gender;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user