diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/gfx_08324AE4.s | 2 | ||||
| -rw-r--r-- | data/sound/programmable_wave_samples.s | 8 | ||||
| -rw-r--r-- | data/sound/voicegroups.s | 31 |
3 files changed, 5 insertions, 36 deletions
diff --git a/data/gfx_08324AE4.s b/data/gfx_08324AE4.s index 44248a1b..2454c2be 100644 --- a/data/gfx_08324AE4.s +++ b/data/gfx_08324AE4.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gAssets:: @ 08324AE4 +gMapData:: @ 08324AE4 .include "data/assets.s" .align 2 diff --git a/data/sound/programmable_wave_samples.s b/data/sound/programmable_wave_samples.s index 135b42da..ddcf6217 100644 --- a/data/sound/programmable_wave_samples.s +++ b/data/sound/programmable_wave_samples.s @@ -7,13 +7,13 @@ @ programmable wave samples gUnk_08A11BAC:: @ 08A11BAC - .incbin "voicegroups/gUnk_08A11BAC.bin" + .incbin "programmable_wave_samples/gUnk_08A11BAC.bin" gUnk_08A11BDC:: @ 08A11BDC - .incbin "voicegroups/gUnk_08A11BDC.bin" + .incbin "programmable_wave_samples/gUnk_08A11BDC.bin" gUnk_08A11C0C:: @ 08A11C0C - .incbin "voicegroups/gUnk_08A11C0C.bin" + .incbin "programmable_wave_samples/gUnk_08A11C0C.bin" gUnk_08A11C1C:: @ 08A11C1C - .incbin "voicegroups/gUnk_08A11C1C.bin" + .incbin "programmable_wave_samples/gUnk_08A11C1C.bin" diff --git a/data/sound/voicegroups.s b/data/sound/voicegroups.s index 7b0fdebb..547adb76 100644 --- a/data/sound/voicegroups.s +++ b/data/sound/voicegroups.s @@ -3757,37 +3757,6 @@ voicegroup033:: @ 08A07394 voice_directsound 60, 0, gUnk_08A84DCC, 255, 0, 255, 165 voice_directsound 60, 0, gUnk_08A5496C, 255, 0, 255, 165 -@ .ifdef EU -@ @ TODO only small differences -@ .incbin "voicegroups/voicegroup033_EU.bin" -@ .4byte 0x2 -@ .incbin "voicegroups/voicegroup033_1_EU.bin" -@ .else -@ .incbin "voicegroups/voicegroup033_2_USA-JP-DEMO_USA-DEMO_JP.bin" -@ .4byte gUnk_08A12ED0 -@ .incbin "voicegroups/voicegroup033_3_USA-JP-DEMO_USA-DEMO_JP.bin" -@ .endif -@ .4byte gUnk_08A16610 -@ .ifdef EU -@ @ TODO only small differences -@ .incbin "voicegroups/voicegroup033_4_EU.bin" -@ .else -@ .incbin "voicegroups/voicegroup033_5_USA-JP-DEMO_USA-DEMO_JP.bin" -@ .endif -@ .4byte gUnk_08A12ED0 -@ .ifdef EU -@ @ TODO only small differences -@ .incbin "voicegroups/voicegroup033_6_EU.bin" -@ .else -@ .incbin "voicegroups/voicegroup033_7_USA-JP-DEMO_USA-DEMO_JP.bin" -@ .endif -@ .4byte gUnk_08A1A54C -@ .incbin "voicegroups/voicegroup033_8.bin" -@ .4byte gUnk_08A84DCC -@ .incbin "voicegroups/voicegroup033_9.bin" -@ .4byte gUnk_08A5496C -@ .incbin "voicegroups/voicegroup033_10.bin" - voicegroup034:: @ 08A07610 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 |