diff options
34 files changed, 1014 insertions, 629 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 27eee478a..4df690e59 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -7327,8 +7327,8 @@ _081A36C2: bx r1 thumb_func_end sub_81A3610 - thumb_func_start sub_81A36D0 -sub_81A36D0: @ 81A36D0 + thumb_func_start CopyFrontierTrainerText +CopyFrontierTrainerText: @ 81A36D0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -7561,7 +7561,7 @@ _081A38F8: pop {r0} bx r0 .pool - thumb_func_end sub_81A36D0 + thumb_func_end CopyFrontierTrainerText thumb_func_start sub_81A3908 sub_81A3908: @ 81A3908 diff --git a/asm/pokenav.s b/asm/pokenav.s index 4851cd221..cfad3feda 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -28079,8 +28079,8 @@ sub_81D5520: @ 81D5520 .pool thumb_func_end sub_81D5520 - thumb_func_start sub_81D5530 -sub_81D5530: @ 81D5530 + thumb_func_start GetTrainerHillOpponentClass +GetTrainerHillOpponentClass: @ 81D5530 lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -28096,10 +28096,10 @@ sub_81D5530: @ 81D5530 ldrb r0, [r0] bx lr .pool - thumb_func_end sub_81D5530 + thumb_func_end GetTrainerHillOpponentClass - thumb_func_start sub_81D5554 -sub_81D5554: @ 81D5554 + thumb_func_start GetTrainerHillTrainerName +GetTrainerHillTrainerName: @ 81D5554 push {r4,lr} adds r4, r0, 0 lsls r1, 24 @@ -28125,10 +28125,10 @@ _081D556E: pop {r0} bx r0 .pool - thumb_func_end sub_81D5554 + thumb_func_end GetTrainerHillTrainerName - thumb_func_start sub_81D5588 -sub_81D5588: @ 81D5588 + thumb_func_start GetTrainerHillTrainerFrontSpriteId +GetTrainerHillTrainerFrontSpriteId: @ 81D5588 push {r4,lr} adds r4, r0, 0 lsls r4, 16 @@ -28160,7 +28160,7 @@ sub_81D5588: @ 81D5588 pop {r1} bx r1 .pool - thumb_func_end sub_81D5588 + thumb_func_end GetTrainerHillTrainerFrontSpriteId thumb_func_start sub_81D55D0 sub_81D55D0: @ 81D55D0 @@ -28324,8 +28324,8 @@ _081D5722: .pool thumb_func_end sub_81D5710 - thumb_func_start sub_81D572C -sub_81D572C: @ 81D572C + thumb_func_start CopyTrainerHillTrainerText +CopyTrainerHillTrainerText: @ 81D572C push {r4-r6,lr} adds r4, r1, 0 lsls r0, 24 @@ -28441,7 +28441,7 @@ _081D580E: pop {r0} bx r0 .pool - thumb_func_end sub_81D572C + thumb_func_end CopyTrainerHillTrainerText thumb_func_start sub_81D581C sub_81D581C: @ 81D581C @@ -29704,7 +29704,7 @@ sub_81D62B4: @ 81D62B4 ldr r0, =gSpecialVar_LastTalked ldrh r1, [r0] movs r0, 0x5 - bl sub_81D572C + bl CopyTrainerHillTrainerText bl sub_80982B8 pop {r0} bx r0 diff --git a/charmap.txt b/charmap.txt index 6bcb0703a..a736b40f2 100644 --- a/charmap.txt +++ b/charmap.txt @@ -360,7 +360,7 @@ B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D B_ATK_PARTNER_NAME = FD 0E B_ATK_NAME_WITH_PREFIX = FD 0F B_DEF_NAME_WITH_PREFIX = FD 10 -B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBank +B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBattler B_ACTIVE_NAME_WITH_PREFIX = FD 12 B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13 B_CURRENT_MOVE = FD 14 @@ -373,11 +373,11 @@ B_SCR_ACTIVE_ABILITY = FD 1A B_EFF_ABILITY = FD 1B B_TRAINER1_CLASS = FD 1C B_TRAINER1_NAME = FD 1D -B_1E = FD 1E @ trainer name for a link player -B_1F = FD 1F @ trainer name for a link player -B_20 = FD 20 @ trainer name for a link player -B_21 = FD 21 @ trainer name for a link player -B_22 = FD 22 @ trainer name for a link player +B_LINK_PLAYER_NAME = FD 1E +B_LINK_PARTNER_NAME = FD 1F +B_LINK_OPPONENT1_NAME = FD 20 +B_LINK_OPPONENT2_NAME = FD 21 +B_LINK_SCR_TRAINER_NAME = FD 22 B_PLAYER_NAME = FD 23 B_TRAINER1_LOSE_TEXT = FD 24 B_TRAINER1_WIN_TEXT = FD 25 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index fec030bb5..0c5e172b0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText - jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd BattleScript_LocalBattleLostPrintWhiteOut:: diff --git a/graphics/battle_interface/window4.png b/graphics/battle_interface/healthbox_doubles_opponent.png Binary files differindex def9d07af..def9d07af 100644 --- a/graphics/battle_interface/window4.png +++ b/graphics/battle_interface/healthbox_doubles_opponent.png diff --git a/graphics/battle_interface/window3.png b/graphics/battle_interface/healthbox_doubles_player.png Binary files differindex f843c664b..f843c664b 100644 --- a/graphics/battle_interface/window3.png +++ b/graphics/battle_interface/healthbox_doubles_player.png diff --git a/graphics/battle_interface/window5.png b/graphics/battle_interface/healthbox_safari.png Binary files differindex e48f380a4..e48f380a4 100644 --- a/graphics/battle_interface/window5.png +++ b/graphics/battle_interface/healthbox_safari.png diff --git a/graphics/battle_interface/window2.png b/graphics/battle_interface/healthbox_singles_opponent.png Binary files differindex 52f70e858..52f70e858 100644 --- a/graphics/battle_interface/window2.png +++ b/graphics/battle_interface/healthbox_singles_opponent.png diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/healthbox_singles_player.png Binary files differindex 0862ca399..0862ca399 100644 --- a/graphics/battle_interface/window.png +++ b/graphics/battle_interface/healthbox_singles_player.png diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 4ef860e80..d032f9f74 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -1,6 +1,11 @@ #ifndef GUARD_BATTLE_FRONTIER_2_H #define GUARD_BATTLE_FRONTIER_2_H +#define FRONTIER_BEFORE_TEXT 0 +#define FRONTIER_WIN_TEXT 1 +#define FRONTIER_LOSE_TEXT 2 + +void CopyFrontierTrainerText(u8 whichText, u16 trainerId); void sub_81A8934(u8); void sub_81A895C(void); u16 sub_81A89A0(u8); diff --git a/include/battle_message.h b/include/battle_message.h index 94f584935..5d811fe69 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -34,11 +34,11 @@ #define B_TXT_EFF_ABILITY 0x1B #define B_TXT_TRAINER1_CLASS 0x1C #define B_TXT_TRAINER1_NAME 0x1D -#define B_TXT_1E 0x1E // trainer name for a link player -#define B_TXT_1F 0x1F // trainer name for a link player -#define B_TXT_20 0x20 // trainer name for a link player -#define B_TXT_21 0x21 // trainer name for a link player -#define B_TXT_22 0x22 // trainer name for a link player +#define B_TXT_LINK_PLAYER_NAME 0x1E +#define B_TXT_LINK_PARTNER_NAME 0x1F +#define B_TXT_LINK_OPPONENT1_NAME 0x20 +#define B_TXT_LINK_OPPONENT2_NAME 0x21 +#define B_TXT_LINK_SCR_TRAINER_NAME 0x22 #define B_TXT_PLAYER_NAME 0x23 #define B_TXT_TRAINER1_LOSE_TEXT 0x24 #define B_TXT_TRAINER1_WIN_TEXT 0x25 diff --git a/include/constants/battle.h b/include/constants/battle.h index e5ca9d7ae..25544ba3d 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -46,7 +46,7 @@ // Battle Type Flags #define BATTLE_TYPE_DOUBLE 0x0001 #define BATTLE_TYPE_LINK 0x0002 -#define BATTLE_TYPE_WILD 0x0004 +#define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. #define BATTLE_TYPE_TRAINER 0x0008 #define BATTLE_TYPE_FIRST_BATTLE 0x0010 #define BATTLE_TYPE_20 0x0020 @@ -70,7 +70,7 @@ #define BATTLE_TYPE_x800000 0x800000 #define BATTLE_TYPE_RECORDED 0x1000000 #define BATTLE_TYPE_x2000000 0x2000000 -#define BATTLE_TYPE_x4000000 0x4000000 +#define BATTLE_TYPE_TRAINER_HILL 0x4000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_GROUDON 0x10000000 #define BATTLE_TYPE_KYOGRE 0x20000000 diff --git a/sound/key_split_tables/86B46BC.bin b/sound/key_split_tables/86B46BC.bin Binary files differdeleted file mode 100644 index 078c76ad9..000000000 --- a/sound/key_split_tables/86B46BC.bin +++ /dev/null diff --git a/sound/key_split_tables/86B46E0.bin b/sound/key_split_tables/86B46E0.bin Binary files differdeleted file mode 100644 index 5ab68d78e..000000000 --- a/sound/key_split_tables/86B46E0.bin +++ /dev/null diff --git a/sound/key_split_tables/86B4728.bin b/sound/key_split_tables/86B4728.bin Binary files differdeleted file mode 100644 index b14903403..000000000 --- a/sound/key_split_tables/86B4728.bin +++ /dev/null diff --git a/sound/key_split_tables/86B477C.bin b/sound/key_split_tables/86B477C.bin Binary files differdeleted file mode 100644 index d794d1774..000000000 --- a/sound/key_split_tables/86B477C.bin +++ /dev/null diff --git a/sound/key_split_tables/86B47C4.bin b/sound/key_split_tables/86B47C4.bin Binary files differdeleted file mode 100644 index 37fcc4ff2..000000000 --- a/sound/key_split_tables/86B47C4.bin +++ /dev/null diff --git a/sound/keysplit_tables.inc b/sound/keysplit_tables.inc index f37f9cdf8..81301ef62 100644 --- a/sound/keysplit_tables.inc +++ b/sound/keysplit_tables.inc @@ -1,18 +1,393 @@ -KeySplitTable_86B4698:: @ 86B4698 -@ This is weird. There are instruments at the beginning of the keysplit table. - voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4698 - voice_directsound_no_resample 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86B46A4 - voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86B46B0 - .incbin "sound/key_split_tables/86B46BC.bin" +@ Due to the way mks4agb (Nintendo's tool) works, key split table labels can +@ appear before the actual start of the key split table data. If you look at +@ the first keysplit table (KeySplitTable1), you'll notice it's offset backwards +@ by 36 bytes. This is because the key split tables don't map instruments +@ for the entire note range (0-127)--they only map subsets, and the upper +@ and lower ranges aren't necessarily 0 or 127. +@ +@ For example if a key split table maps an note range of 10-20, then the key +@ split table label will be offset 10 bytes before the actual key split data +@ begins. Therefore, the notes naturally map to the key split table without +@ any extra offset calculation. -KeySplitTable_86B46E0:: @ 86B46E0 - .incbin "sound/key_split_tables/86B46E0.bin" +.set KeySplitTable1, . - 36 + .byte 0 @ 36 + .byte 0 @ 37 + .byte 0 @ 38 + .byte 0 @ 39 + .byte 0 @ 40 + .byte 0 @ 41 + .byte 0 @ 42 + .byte 0 @ 43 + .byte 0 @ 44 + .byte 0 @ 45 + .byte 0 @ 46 + .byte 0 @ 47 + .byte 0 @ 48 + .byte 0 @ 49 + .byte 0 @ 50 + .byte 0 @ 51 + .byte 0 @ 52 + .byte 0 @ 53 + .byte 0 @ 54 + .byte 1 @ 55 + .byte 1 @ 56 + .byte 1 @ 57 + .byte 1 @ 58 + .byte 1 @ 59 + .byte 1 @ 60 + .byte 1 @ 61 + .byte 1 @ 62 + .byte 1 @ 63 + .byte 1 @ 64 + .byte 1 @ 65 + .byte 1 @ 66 + .byte 1 @ 67 + .byte 1 @ 68 + .byte 1 @ 69 + .byte 2 @ 70 + .byte 2 @ 71 + .byte 2 @ 72 + .byte 2 @ 73 + .byte 2 @ 74 + .byte 2 @ 75 + .byte 2 @ 76 + .byte 2 @ 77 + .byte 2 @ 78 + .byte 2 @ 79 + .byte 2 @ 80 + .byte 2 @ 81 + .byte 2 @ 82 + .byte 2 @ 83 + .byte 2 @ 84 + .byte 2 @ 85 + .byte 2 @ 86 + .byte 2 @ 87 + .byte 2 @ 88 + .byte 2 @ 89 + .byte 2 @ 90 + .byte 3 @ 91 + .byte 3 @ 92 + .byte 3 @ 93 + .byte 3 @ 94 + .byte 3 @ 95 + .byte 3 @ 96 + .byte 3 @ 97 + .byte 3 @ 98 + .byte 3 @ 99 + .byte 3 @ 100 + .byte 3 @ 101 + .byte 3 @ 102 + .byte 3 @ 103 + .byte 3 @ 104 + .byte 3 @ 105 + .byte 3 @ 106 + .byte 3 @ 107 -KeySplitTable_86B4728:: @ 86B4728 - .incbin "sound/key_split_tables/86B4728.bin" +.set KeySplitTable2, . - 36 + .byte 0 @ 36 + .byte 0 @ 37 + .byte 0 @ 38 + .byte 0 @ 39 + .byte 0 @ 40 + .byte 0 @ 41 + .byte 0 @ 42 + .byte 0 @ 43 + .byte 0 @ 44 + .byte 0 @ 45 + .byte 0 @ 46 + .byte 0 @ 47 + .byte 0 @ 48 + .byte 0 @ 49 + .byte 0 @ 50 + .byte 0 @ 51 + .byte 0 @ 52 + .byte 0 @ 53 + .byte 0 @ 54 + .byte 0 @ 55 + .byte 0 @ 56 + .byte 0 @ 57 + .byte 0 @ 58 + .byte 0 @ 59 + .byte 0 @ 60 + .byte 0 @ 61 + .byte 0 @ 62 + .byte 0 @ 63 + .byte 0 @ 64 + .byte 0 @ 65 + .byte 0 @ 66 + .byte 0 @ 67 + .byte 0 @ 68 + .byte 1 @ 69 + .byte 1 @ 70 + .byte 1 @ 71 + .byte 1 @ 72 + .byte 1 @ 73 + .byte 1 @ 74 + .byte 1 @ 75 + .byte 1 @ 76 + .byte 1 @ 77 + .byte 1 @ 78 + .byte 1 @ 79 + .byte 1 @ 80 + .byte 2 @ 81 + .byte 2 @ 82 + .byte 2 @ 83 + .byte 2 @ 84 + .byte 2 @ 85 + .byte 2 @ 86 + .byte 2 @ 87 + .byte 2 @ 88 + .byte 2 @ 89 + .byte 2 @ 90 + .byte 2 @ 91 + .byte 2 @ 92 + .byte 2 @ 93 + .byte 2 @ 94 + .byte 2 @ 95 + .byte 2 @ 96 + .byte 2 @ 97 + .byte 2 @ 98 + .byte 2 @ 99 + .byte 2 @ 100 + .byte 2 @ 101 + .byte 2 @ 102 + .byte 2 @ 103 + .byte 2 @ 104 + .byte 2 @ 105 + .byte 2 @ 106 + .byte 2 @ 107 -KeySplitTable_86B477C:: @ 86B477C - .incbin "sound/key_split_tables/86B477C.bin" +.set KeySplitTable3, . - 36 + .byte 0 @ 36 + .byte 0 @ 37 + .byte 0 @ 38 + .byte 0 @ 39 + .byte 0 @ 40 + .byte 0 @ 41 + .byte 0 @ 42 + .byte 0 @ 43 + .byte 0 @ 44 + .byte 0 @ 45 + .byte 0 @ 46 + .byte 0 @ 47 + .byte 0 @ 48 + .byte 0 @ 49 + .byte 0 @ 50 + .byte 0 @ 51 + .byte 0 @ 52 + .byte 0 @ 53 + .byte 0 @ 54 + .byte 0 @ 55 + .byte 0 @ 56 + .byte 0 @ 57 + .byte 0 @ 58 + .byte 0 @ 59 + .byte 0 @ 60 + .byte 0 @ 61 + .byte 0 @ 62 + .byte 0 @ 63 + .byte 0 @ 64 + .byte 0 @ 65 + .byte 1 @ 66 + .byte 1 @ 67 + .byte 1 @ 68 + .byte 1 @ 69 + .byte 1 @ 70 + .byte 1 @ 71 + .byte 1 @ 72 + .byte 1 @ 73 + .byte 1 @ 74 + .byte 1 @ 75 + .byte 1 @ 76 + .byte 1 @ 77 + .byte 1 @ 78 + .byte 1 @ 79 + .byte 1 @ 80 + .byte 1 @ 81 + .byte 1 @ 82 + .byte 1 @ 83 + .byte 2 @ 84 + .byte 2 @ 85 + .byte 2 @ 86 + .byte 2 @ 87 + .byte 2 @ 88 + .byte 2 @ 89 + .byte 2 @ 90 + .byte 2 @ 91 + .byte 2 @ 92 + .byte 2 @ 93 + .byte 2 @ 94 + .byte 2 @ 95 + .byte 2 @ 96 + .byte 2 @ 97 + .byte 2 @ 98 + .byte 2 @ 99 + .byte 2 @ 100 + .byte 2 @ 101 + .byte 2 @ 102 + .byte 2 @ 103 + .byte 2 @ 104 + .byte 2 @ 105 + .byte 2 @ 106 + .byte 2 @ 107 -KeySplitTable_86B47C4:: @ 86B47C4 - .incbin "sound/key_split_tables/86B47C4.bin" +.set KeySplitTable4, . - 24 + .byte 0 @ 24 + .byte 0 @ 25 + .byte 0 @ 26 + .byte 0 @ 27 + .byte 0 @ 28 + .byte 0 @ 29 + .byte 0 @ 30 + .byte 0 @ 31 + .byte 0 @ 32 + .byte 0 @ 33 + .byte 0 @ 34 + .byte 0 @ 35 + .byte 0 @ 36 + .byte 0 @ 37 + .byte 0 @ 38 + .byte 0 @ 39 + .byte 0 @ 40 + .byte 0 @ 41 + .byte 1 @ 42 + .byte 1 @ 43 + .byte 1 @ 44 + .byte 1 @ 45 + .byte 1 @ 46 + .byte 1 @ 47 + .byte 1 @ 48 + .byte 1 @ 49 + .byte 1 @ 50 + .byte 1 @ 51 + .byte 1 @ 52 + .byte 1 @ 53 + .byte 1 @ 54 + .byte 1 @ 55 + .byte 1 @ 56 + .byte 1 @ 57 + .byte 1 @ 58 + .byte 1 @ 59 + .byte 1 @ 60 + .byte 1 @ 61 + .byte 1 @ 62 + .byte 1 @ 63 + .byte 1 @ 64 + .byte 1 @ 65 + .byte 1 @ 66 + .byte 1 @ 67 + .byte 1 @ 68 + .byte 1 @ 69 + .byte 1 @ 70 + .byte 1 @ 71 + .byte 1 @ 72 + .byte 1 @ 73 + .byte 1 @ 74 + .byte 1 @ 75 + .byte 1 @ 76 + .byte 1 @ 77 + .byte 1 @ 78 + .byte 1 @ 79 + .byte 1 @ 80 + .byte 1 @ 81 + .byte 1 @ 82 + .byte 1 @ 83 + .byte 1 @ 84 + .byte 1 @ 85 + .byte 1 @ 86 + .byte 1 @ 87 + .byte 1 @ 88 + .byte 1 @ 89 + .byte 1 @ 90 + .byte 1 @ 91 + .byte 1 @ 92 + .byte 1 @ 93 + .byte 1 @ 94 + .byte 1 @ 95 + .byte 1 @ 96 + .byte 1 @ 97 + .byte 1 @ 98 + .byte 1 @ 99 + .byte 1 @ 100 + .byte 1 @ 101 + .byte 1 @ 102 + .byte 1 @ 103 + .byte 1 @ 104 + .byte 1 @ 105 + .byte 1 @ 106 + .byte 1 @ 107 + +.set KeySplitTable5, . - 36 + .byte 0 @ 36 + .byte 0 @ 37 + .byte 0 @ 38 + .byte 0 @ 39 + .byte 0 @ 40 + .byte 0 @ 41 + .byte 0 @ 42 + .byte 0 @ 43 + .byte 0 @ 44 + .byte 0 @ 45 + .byte 0 @ 46 + .byte 0 @ 47 + .byte 0 @ 48 + .byte 0 @ 49 + .byte 0 @ 50 + .byte 0 @ 51 + .byte 0 @ 52 + .byte 0 @ 53 + .byte 0 @ 54 + .byte 0 @ 55 + .byte 0 @ 56 + .byte 0 @ 57 + .byte 0 @ 58 + .byte 0 @ 59 + .byte 0 @ 60 + .byte 0 @ 61 + .byte 0 @ 62 + .byte 0 @ 63 + .byte 0 @ 64 + .byte 0 @ 65 + .byte 1 @ 66 + .byte 1 @ 67 + .byte 1 @ 68 + .byte 1 @ 69 + .byte 1 @ 70 + .byte 1 @ 71 + .byte 1 @ 72 + .byte 1 @ 73 + .byte 1 @ 74 + .byte 1 @ 75 + .byte 1 @ 76 + .byte 1 @ 77 + .byte 1 @ 78 + .byte 1 @ 79 + .byte 1 @ 80 + .byte 1 @ 81 + .byte 1 @ 82 + .byte 1 @ 83 + .byte 1 @ 84 + .byte 1 @ 85 + .byte 1 @ 86 + .byte 1 @ 87 + .byte 1 @ 88 + .byte 1 @ 89 + .byte 1 @ 90 + .byte 1 @ 91 + .byte 1 @ 92 + .byte 1 @ 93 + .byte 1 @ 94 + .byte 1 @ 95 + .byte 1 @ 96 + .byte 1 @ 97 + .byte 1 @ 98 + .byte 1 @ 99 + .byte 1 @ 100 + .byte 1 @ 101 + .byte 1 @ 102 + .byte 1 @ 103 + .byte 1 @ 104 + .byte 1 @ 105 + .byte 1 @ 106 + .byte 1 @ 107 diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index c7b64aced..389af8701 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1,7 +1,7 @@ .align 2 voicegroup_pokemon_cry:: @ 8675D04 voice_keysplit_all voicegroup_8675FEC @ 8675D04 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8675D10 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8675D10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D34 @@ -48,7 +48,7 @@ voicegroup_pokemon_cry:: @ 8675D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F2C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 8675F38 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8675F44 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8675F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F68 @@ -56,7 +56,7 @@ voicegroup_pokemon_cry:: @ 8675D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F98 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8675FA4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8675FA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FC8 @@ -509,7 +509,7 @@ voicegroup_8677138:: @ 8677138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677354 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8677360 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867736C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8677378 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8677378 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677384 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677390 voice_square_1 0, 2, 0, 0, 15, 0 @ 867739C @@ -517,11 +517,11 @@ voicegroup_8677138:: @ 8677138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86773B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86773C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86773CC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86773D8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86773D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86773E4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86773F0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86773F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86773FC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8677408 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8677408 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677414 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677420 voice_square_1 0, 2, 0, 0, 15, 0 @ 867742C @@ -596,7 +596,7 @@ voicegroup_8677528:: @ 8677528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677744 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677750 voice_square_1 0, 2, 0, 0, 15, 0 @ 867775C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8677768 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8677768 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677774 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677780 voice_square_1 0, 2, 0, 0, 15, 0 @ 867778C @@ -680,7 +680,7 @@ voicegroup_8677528:: @ 8677528 .align 2 voicegroup_8677B28:: @ 8677B28 voice_keysplit_all voicegroup_8675FEC @ 8677B28 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8677B34 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8677B34 voice_directsound 60, 0, DirectSoundWaveData_87322BC, 255, 178, 180, 165 @ 8677B40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8677B58 @@ -727,7 +727,7 @@ voicegroup_8677B28:: @ 8677B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D44 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8677D50 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8677D5C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8677D68 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8677D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677D8C @@ -735,11 +735,11 @@ voicegroup_8677B28:: @ 8677B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677DB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677DBC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8677DC8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8677DC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677DD4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8677DE0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8677DE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677DEC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8677DF8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8677DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8677E1C @@ -832,7 +832,7 @@ voicegroup_8677FF0:: @ 8677FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867820C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678218 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8678224 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8678230 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8678230 voice_square_1 0, 2, 0, 0, 15, 0 @ 867823C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678248 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678254 @@ -840,11 +840,11 @@ voicegroup_8677FF0:: @ 8677FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867826C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678278 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678284 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8678290 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8678290 voice_square_1 0, 2, 0, 0, 15, 0 @ 867829C voice_square_1 0, 2, 0, 0, 15, 0 @ 86782A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86782B4 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86782C0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86782C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86782CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86782D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86782E4 @@ -878,7 +878,7 @@ voicegroup_8677FF0:: @ 8677FF0 .align 2 voicegroup_8678428:: @ 8678428 voice_keysplit_all voicegroup_8675FEC @ 8678428 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8678434 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8678434 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678440 voice_square_1 0, 2, 0, 0, 15, 0 @ 867844C voice_square_2_alt 3, 0, 1, 6, 1 @ 8678458 @@ -925,7 +925,7 @@ voicegroup_8678428:: @ 8678428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678644 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 8678650 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867865C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8678668 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8678668 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678680 voice_square_1 0, 2, 0, 0, 15, 0 @ 867868C @@ -933,11 +933,11 @@ voicegroup_8678428:: @ 8678428 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786BC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86786C8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86786C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86786EC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86786F8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86786F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678704 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678710 voice_square_1 0, 2, 0, 0, 15, 0 @ 867871C @@ -966,7 +966,7 @@ voicegroup_8678428:: @ 8678428 .align 2 voicegroup_8678824:: @ 8678824 voice_keysplit_all voicegroup_8678C74 @ 8678824 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8678830 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8678830 voice_square_1 0, 2, 0, 0, 15, 0 @ 867883C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678848 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678854 @@ -1013,7 +1013,7 @@ voicegroup_8678824:: @ 8678824 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A58 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8678A64 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8678A64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8678A88 @@ -1176,7 +1176,7 @@ voicegroup_8678F80:: @ 8678F80 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867919C voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 86791A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86791B4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86791C0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86791C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86791CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86791D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86791E4 @@ -1186,9 +1186,9 @@ voicegroup_8678F80:: @ 8678F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679214 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679220 voice_square_1 0, 2, 0, 0, 15, 0 @ 867922C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8679238 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8679238 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679244 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8679250 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8679250 voice_square_1 0, 2, 0, 0, 15, 0 @ 867925C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679268 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679274 @@ -1223,7 +1223,7 @@ voicegroup_8678F80:: @ 8678F80 .align 2 voicegroup_86793C4:: @ 86793C4 voice_keysplit_all voicegroup_8675FEC @ 86793C4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86793D0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86793D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86793DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86793E8 voice_square_2_alt 0, 0, 1, 7, 1 @ 86793F4 @@ -1270,7 +1270,7 @@ voicegroup_86793C4:: @ 86793C4 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86795E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86795EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86795F8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8679604 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8679604 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679610 voice_square_1 0, 2, 0, 0, 15, 0 @ 867961C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679628 @@ -1401,7 +1401,7 @@ voicegroup_86799C4:: @ 86799C4 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8679BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679BF8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8679C04 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8679C04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C28 @@ -1411,9 +1411,9 @@ voicegroup_86799C4:: @ 86799C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C70 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8679C7C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8679C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8679C88 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8679C94 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8679C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679CA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679CAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679CB8 @@ -1441,7 +1441,7 @@ voicegroup_86799C4:: @ 86799C4 .align 2 voicegroup_8679DC0:: @ 8679DC0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8679DC0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8679DC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679DCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679DD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679DE4 @@ -1489,7 +1489,7 @@ voicegroup_8679DC0:: @ 8679DC0 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8679FDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8679FF4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867A000 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867A000 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A00C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A018 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A024 @@ -1499,7 +1499,7 @@ voicegroup_8679DC0:: @ 8679DC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A054 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A060 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A06C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 867A078 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 867A078 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A084 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A090 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A09C @@ -1579,7 +1579,7 @@ voicegroup_867A1D4:: @ 867A1D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A3FC voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867A408 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867A414 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867A414 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A420 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A42C @@ -1590,11 +1590,11 @@ voicegroup_867A438:: @ 867A438 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A450 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A45C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A468 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867A474 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867A474 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A480 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 867A48C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 867A48C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A498 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867A4A4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867A4A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A4B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 867A4C8 @@ -1653,7 +1653,7 @@ voicegroup_867A438:: @ 867A438 .align 2 voicegroup_867A744:: @ 867A744 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867A744 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867A744 voice_keysplit_all voicegroup_8675FEC @ 867A750 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A75C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A768 @@ -1701,7 +1701,7 @@ voicegroup_867A744:: @ 867A744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A960 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867A96C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A978 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867A984 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867A984 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A990 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A99C voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9A8 @@ -1709,7 +1709,7 @@ voicegroup_867A744:: @ 867A744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9D8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867A9E4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867A9E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867A9FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867AA08 @@ -1793,7 +1793,7 @@ voicegroup_867AB70:: @ 867AB70 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867AD8C voice_square_1 0, 2, 0, 0, 15, 0 @ 867AD98 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867ADA4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867ADB0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867ADB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADBC voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADD4 @@ -1801,11 +1801,11 @@ voicegroup_867AB70:: @ 867AB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADEC voice_square_1 0, 2, 0, 0, 15, 0 @ 867ADF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE04 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867AE10 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867AE10 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE1C voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE28 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE34 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867AE40 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867AE40 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE4C voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE58 voice_square_1 0, 2, 0, 0, 15, 0 @ 867AE64 @@ -1895,9 +1895,9 @@ voicegroup_867AFB4:: @ 867AFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B230 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B23C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B248 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867B254 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867B254 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B260 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 867B26C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 867B26C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B278 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B284 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B290 @@ -1986,7 +1986,7 @@ voicegroup_867B3A4:: @ 867B3A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B650 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B65C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B668 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867B674 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867B674 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B680 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B68C voice_square_1 0, 2, 0, 0, 15, 0 @ 867B698 @@ -2015,7 +2015,7 @@ voicegroup_867B3A4:: @ 867B3A4 .align 2 voicegroup_867B7A0:: @ 867B7A0 voice_keysplit_all voicegroup_8675FEC @ 867B7A0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867B7AC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867B7AC voice_square_1 0, 2, 0, 0, 15, 0 @ 867B7B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B7C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867B7D0 @@ -2201,7 +2201,7 @@ voicegroup_867BDA0:: @ 867BDA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C01C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C028 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C034 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867C040 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867C040 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C04C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C058 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C064 @@ -2279,7 +2279,7 @@ voicegroup_867C184:: @ 867C184 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867C3A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3AC voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867C3B8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867C3C4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867C3C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3DC voice_square_1 0, 2, 0, 0, 15, 0 @ 867C3E8 @@ -2287,11 +2287,11 @@ voicegroup_867C184:: @ 867C184 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C400 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C40C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C418 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867C424 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867C424 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C430 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C43C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C448 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867C454 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867C454 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C460 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C46C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C478 @@ -2323,7 +2323,7 @@ voicegroup_867C184:: @ 867C184 .align 2 voicegroup_867C5A4:: @ 867C5A4 voice_keysplit_all voicegroup_867C838 @ 867C5A4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867C5B0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867C5B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 867C5C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C5D4 @@ -2385,7 +2385,7 @@ voicegroup_867C838:: @ 867C838 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C850 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C85C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C868 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867C874 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867C874 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C880 voice_square_1 0, 2, 0, 0, 15, 0 @ 867C88C voice_square_1 0, 2, 0, 0, 15, 0 @ 867C898 @@ -2449,7 +2449,7 @@ voicegroup_867C838:: @ 867C838 .align 2 voicegroup_867CB44:: @ 867CB44 voice_keysplit_all voicegroup_8678C74 @ 867CB44 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867CB50 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867CB50 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB5C voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB68 voice_square_1 0, 2, 0, 0, 15, 0 @ 867CB74 @@ -2627,7 +2627,7 @@ voicegroup_867D144:: @ 867D144 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D360 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867D36C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D378 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867D384 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867D384 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D390 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D39C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D3A8 @@ -2639,7 +2639,7 @@ voicegroup_867D144:: @ 867D144 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D3FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867D408 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867D414 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867D414 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D420 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D42C voice_square_1 0, 2, 0, 0, 15, 0 @ 867D438 @@ -2666,7 +2666,7 @@ voicegroup_867D144:: @ 867D144 .align 2 voicegroup_867D528:: @ 867D528 voice_keysplit_all voicegroup_8675FEC @ 867D528 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867D534 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867D534 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D540 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D54C voice_square_2 2, 0, 1, 4, 2 @ 867D558 @@ -2713,7 +2713,7 @@ voicegroup_867D528:: @ 867D528 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 867D744 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D750 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D75C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867D768 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867D768 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D774 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D780 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D78C @@ -2753,7 +2753,7 @@ voicegroup_867D528:: @ 867D528 .align 2 voicegroup_867D918:: @ 867D918 voice_keysplit_all voicegroup_867C838 @ 867D918 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 867D924 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 867D924 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D930 voice_square_1 0, 2, 0, 0, 15, 0 @ 867D93C voice_square_2_alt 2, 0, 1, 7, 1 @ 867D948 @@ -2800,7 +2800,7 @@ voicegroup_867D918:: @ 867D918 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB34 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB40 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867DB4C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867DB58 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867DB58 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB64 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB7C @@ -2808,11 +2808,11 @@ voicegroup_867D918:: @ 867D918 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DB94 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBAC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867DBB8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867DBB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBDC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867DBE8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867DBE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DBF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DC00 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DC0C @@ -2888,7 +2888,7 @@ voicegroup_867DD14:: @ 867DD14 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 867DF30 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867DF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF48 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867DF54 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867DF54 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF60 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF6C voice_square_1 0, 2, 0, 0, 15, 0 @ 867DF78 @@ -2900,7 +2900,7 @@ voicegroup_867DD14:: @ 867DD14 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DFC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DFCC voice_square_1 0, 2, 0, 0, 15, 0 @ 867DFD8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867DFE4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867DFE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867DFFC voice_square_1 0, 2, 0, 0, 15, 0 @ 867E008 @@ -3019,7 +3019,7 @@ voicegroup_867E314:: @ 867E314 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E530 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 867E53C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 867E548 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867E554 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867E554 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E560 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E56C voice_square_1 0, 2, 0, 0, 15, 0 @ 867E578 @@ -3029,9 +3029,9 @@ voicegroup_867E314:: @ 867E314 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5C0 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 867E5CC + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 867E5CC voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5D8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867E5E4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867E5E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867E5FC voice_square_1 0, 2, 0, 0, 15, 0 @ 867E608 @@ -3196,7 +3196,7 @@ voicegroup_867EB18:: @ 867EB18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED34 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED40 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED4C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867ED58 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867ED58 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED64 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED7C @@ -3204,11 +3204,11 @@ voicegroup_867EB18:: @ 867EB18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867ED94 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDAC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867EDB8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867EDB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDDC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867EDE8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867EDE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EDF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE00 voice_square_1 0, 2, 0, 0, 15, 0 @ 867EE0C @@ -3327,7 +3327,7 @@ voicegroup_867F118:: @ 867F118 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F334 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F340 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F34C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867F358 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867F358 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F364 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F370 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F37C @@ -3335,11 +3335,11 @@ voicegroup_867F118:: @ 867F118 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F394 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3AC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867F3B8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867F3B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3DC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867F3E8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867F3E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F3F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F400 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F40C @@ -3458,7 +3458,7 @@ voicegroup_867F718:: @ 867F718 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F934 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F940 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F94C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867F958 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867F958 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F964 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F970 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F97C @@ -3466,11 +3466,11 @@ voicegroup_867F718:: @ 867F718 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F994 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9AC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867F9B8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867F9B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9DC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867F9E8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867F9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867F9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FA0C @@ -3589,7 +3589,7 @@ voicegroup_867FD18:: @ 867FD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF34 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF40 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF4C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 867FF58 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 867FF58 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF64 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF70 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF7C @@ -3597,11 +3597,11 @@ voicegroup_867FD18:: @ 867FD18 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FF94 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFAC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 867FFB8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 867FFB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFDC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 867FFE8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 867FFE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 867FFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680000 voice_square_1 0, 2, 0, 0, 15, 0 @ 868000C @@ -3673,7 +3673,7 @@ voicegroup_867FD18:: @ 867FD18 .align 2 voicegroup_8680318:: @ 8680318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680318 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8680324 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8680324 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680330 voice_square_1 0, 2, 0, 0, 15, 0 @ 868033C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680348 @@ -3720,7 +3720,7 @@ voicegroup_8680318:: @ 8680318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680534 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680540 voice_square_1 0, 2, 0, 0, 15, 0 @ 868054C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8680558 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8680558 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680564 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680570 voice_square_1 0, 2, 0, 0, 15, 0 @ 868057C @@ -3730,7 +3730,7 @@ voicegroup_8680318:: @ 8680318 voice_square_1 0, 2, 0, 0, 15, 0 @ 86805AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86805B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86805C4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86805D0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86805D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86805DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86805E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86805F4 @@ -3756,7 +3756,7 @@ voicegroup_8680318:: @ 8680318 .align 2 voicegroup_86806E4:: @ 86806E4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86806E4 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86806E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86806F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86806FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8680708 @@ -3804,7 +3804,7 @@ voicegroup_86806E4:: @ 86806E4 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8680900 voice_square_1 0, 2, 0, 0, 15, 0 @ 868090C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680918 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8680924 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8680924 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680930 voice_square_1 0, 2, 0, 0, 15, 0 @ 868093C voice_square_1 0, 2, 0, 0, 15, 0 @ 8680948 @@ -3850,7 +3850,7 @@ voicegroup_8680AB0:: @ 8680AB0 voice_programmable_wave_alt ProgrammableWaveData_86B4860, 1, 7, 15, 1 @ 8680B04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B1C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8680B28 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8680B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680B4C @@ -3888,7 +3888,7 @@ voicegroup_8680AB0:: @ 8680AB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8680CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680CE4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8680CF0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8680CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8680D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8680D14 @@ -3971,7 +3971,7 @@ voicegroup_8680AB0:: @ 8680AB0 .align 2 voicegroup_86810B0:: @ 86810B0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86810B0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86810B0 voice_programmable_wave_alt ProgrammableWaveData_86B4900, 0, 1, 12, 0 @ 86810BC voice_square_1_alt 0, 0, 1, 1, 9, 0 @ 86810C8 voice_square_2_alt 2, 0, 2, 6, 3 @ 86810D4 @@ -4019,7 +4019,7 @@ voicegroup_86810B0:: @ 86810B0 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 165 @ 86812CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86812D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812E4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86812F0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86812F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86812FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8681308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681314 @@ -4150,7 +4150,7 @@ voicegroup_86816B0:: @ 86816B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818CC voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 86818D8 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 86818E4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86818F0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86818F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86818FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8681908 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681914 @@ -4158,11 +4158,11 @@ voicegroup_86816B0:: @ 86816B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868192C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681938 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681944 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8681950 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8681950 voice_square_1 0, 2, 0, 0, 15, 0 @ 868195C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8681968 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8681968 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681974 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8681980 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8681980 voice_square_1 0, 2, 0, 0, 15, 0 @ 868198C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681998 voice_square_1 0, 2, 0, 0, 15, 0 @ 86819A4 @@ -4281,7 +4281,7 @@ voicegroup_8681CB0:: @ 8681CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681ECC voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8681ED8 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 239 @ 8681EE4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8681EF0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8681EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F14 @@ -4289,11 +4289,11 @@ voicegroup_8681CB0:: @ 8681CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F44 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8681F50 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8681F50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F5C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8681F68 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8681F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F74 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8681F80 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8681F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8681F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8681FA4 @@ -4325,7 +4325,7 @@ voicegroup_8681CB0:: @ 8681CB0 .align 2 voicegroup_86820D0:: @ 86820D0 voice_keysplit_all voicegroup_8675FEC @ 86820D0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86820DC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86820DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86820E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86820F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682100 @@ -4372,7 +4372,7 @@ voicegroup_86820D0:: @ 86820D0 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 86822EC voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86822F8 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 8682304 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8682310 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8682310 voice_square_1 0, 2, 0, 0, 15, 0 @ 868231C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682328 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682334 @@ -4380,11 +4380,11 @@ voicegroup_86820D0:: @ 86820D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868234C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682358 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682364 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8682370 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8682370 voice_square_1 0, 2, 0, 0, 15, 0 @ 868237C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682388 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682394 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86823A0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86823A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86823AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86823B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86823C4 @@ -4456,7 +4456,7 @@ voicegroup_86820D0:: @ 86820D0 .align 2 voicegroup_86826D0:: @ 86826D0 voice_keysplit_all voicegroup_8675FEC @ 86826D0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86826DC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86826DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86826E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86826F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682700 @@ -4587,7 +4587,7 @@ voicegroup_86826D0:: @ 86826D0 .align 2 voicegroup_8682CD0:: @ 8682CD0 voice_keysplit_all voicegroup_8675FEC @ 8682CD0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8682CDC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8682CDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8682CE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682CF4 voice_square_2_alt 2, 1, 4, 4, 2 @ 8682D00 @@ -4634,7 +4634,7 @@ voicegroup_8682CD0:: @ 8682CD0 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 99 @ 8682EEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8682EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682F04 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8682F10 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8682F10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8682F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8682F34 @@ -4711,7 +4711,7 @@ voicegroup_8683048:: @ 8683048 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683264 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683270 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 868327C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8683288 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8683288 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683294 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832AC @@ -4719,11 +4719,11 @@ voicegroup_8683048:: @ 8683048 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832DC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86832E8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86832E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86832F4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8683300 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8683300 voice_square_1 0, 2, 0, 0, 15, 0 @ 868330C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8683318 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8683318 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683324 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683330 voice_square_1 0, 2, 0, 0, 15, 0 @ 868333C @@ -4795,7 +4795,7 @@ voicegroup_8683048:: @ 8683048 .align 2 voicegroup_8683648:: @ 8683648 voice_keysplit_all voicegroup_8675FEC @ 8683648 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8683654 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8683654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683660 voice_square_1 0, 2, 0, 0, 15, 0 @ 868366C voice_square_1 0, 2, 0, 0, 15, 0 @ 8683678 @@ -4842,7 +4842,7 @@ voicegroup_8683648:: @ 8683648 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8683864 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683870 voice_square_1 0, 2, 0, 0, 15, 0 @ 868387C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8683888 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8683888 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683894 voice_square_1 0, 2, 0, 0, 15, 0 @ 86838A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86838AC @@ -4973,7 +4973,7 @@ voicegroup_8683C48:: @ 8683C48 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8683E64 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8683E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E7C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8683E88 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8683E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683EAC @@ -4983,9 +4983,9 @@ voicegroup_8683C48:: @ 8683C48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683EDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8683EE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683EF4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8683F00 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8683F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F0C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8683F18 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8683F18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8683F3C @@ -5104,7 +5104,7 @@ voicegroup_8684248:: @ 8684248 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684464 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 204 @ 8684470 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 204, 193, 239 @ 868447C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8684488 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8684488 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844AC @@ -5112,11 +5112,11 @@ voicegroup_8684248:: @ 8684248 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844DC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86844E8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86844E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86844F4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8684500 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8684500 voice_square_1 0, 2, 0, 0, 15, 0 @ 868450C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8684518 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8684518 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684530 voice_square_1 0, 2, 0, 0, 15, 0 @ 868453C @@ -5235,7 +5235,7 @@ voicegroup_8684848:: @ 8684848 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A7C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8684A88 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8684A88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684A94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684AAC @@ -5247,7 +5247,7 @@ voicegroup_8684848:: @ 8684848 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684AF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B0C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8684B18 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8684B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8684B3C @@ -5366,7 +5366,7 @@ voicegroup_8684E48:: @ 8684E48 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8685064 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8685070 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 226 @ 868507C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8685088 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8685088 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685094 voice_square_1 0, 2, 0, 0, 15, 0 @ 86850A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86850AC @@ -5505,9 +5505,9 @@ voicegroup_8685448:: @ 8685448 voice_square_1 0, 2, 0, 0, 15, 0 @ 86856C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86856D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86856DC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86856E8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86856E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86856F4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8685700 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8685700 voice_square_1 0, 2, 0, 0, 15, 0 @ 868570C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685718 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685724 @@ -5581,7 +5581,7 @@ voicegroup_8685448:: @ 8685448 .align 2 voicegroup_8685A48:: @ 8685A48 voice_keysplit_all voicegroup_8675FEC @ 8685A48 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8685A54 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8685A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685A60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685A6C voice_square_2_alt 1, 1, 1, 6, 2 @ 8685A78 @@ -5628,7 +5628,7 @@ voicegroup_8685A48:: @ 8685A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C64 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8685C70 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8685C7C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8685C88 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8685C88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CAC @@ -5636,11 +5636,11 @@ voicegroup_8685A48:: @ 8685A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CDC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8685CE8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8685CE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685CF4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8685D00 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8685D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D0C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8685D18 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8685D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685D3C @@ -5673,7 +5673,7 @@ voicegroup_8685A48:: @ 8685A48 .align 2 voicegroup_8685E74:: @ 8685E74 voice_keysplit_all voicegroup_8675FEC @ 8685E74 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8685E80 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8685E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8685E98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8685EA4 @@ -5720,7 +5720,7 @@ voicegroup_8685E74:: @ 8685E74 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 128, 226, 0, 38 @ 8686090 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868609C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86860A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86860B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86860B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86860D8 @@ -5728,11 +5728,11 @@ voicegroup_8685E74:: @ 8685E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86860FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8686108 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8686114 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8686114 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686120 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 868612C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 868612C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686138 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8686144 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8686144 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686150 voice_square_1 0, 2, 0, 0, 15, 0 @ 868615C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686168 @@ -5859,7 +5859,7 @@ voicegroup_8686474:: @ 8686474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86866F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86866FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8686708 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8686714 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8686714 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686720 voice_square_1 0, 2, 0, 0, 15, 0 @ 868672C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686738 @@ -5990,7 +5990,7 @@ voicegroup_8686A74:: @ 8686A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8686D08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8686D14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8686D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8686D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8686D38 @@ -6121,7 +6121,7 @@ voicegroup_8687074:: @ 8687074 voice_square_1 0, 2, 0, 0, 15, 0 @ 86872F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86872FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8687308 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8687314 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8687314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687320 voice_square_1 0, 2, 0, 0, 15, 0 @ 868732C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687338 @@ -6244,7 +6244,7 @@ voicegroup_8687674:: @ 8687674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687890 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868789C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86878A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86878B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86878B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86878C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86878CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86878D8 @@ -6256,7 +6256,7 @@ voicegroup_8687674:: @ 8687674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687920 voice_square_1 0, 2, 0, 0, 15, 0 @ 868792C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687938 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8687944 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8687944 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687950 voice_square_1 0, 2, 0, 0, 15, 0 @ 868795C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687968 @@ -6328,7 +6328,7 @@ voicegroup_8687674:: @ 8687674 .align 2 voicegroup_8687C74:: @ 8687C74 voice_keysplit_all voicegroup_8675FEC @ 8687C74 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8687C80 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8687C80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687C8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687CA4 @@ -6383,7 +6383,7 @@ voicegroup_8687C74:: @ 8687C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8687F08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8687F14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8687F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8687F2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8687F38 @@ -6590,7 +6590,7 @@ voicegroup_8688274:: @ 8688274 .align 2 voicegroup_8688874:: @ 8688874 voice_keysplit_all voicegroup_8675FEC @ 8688874 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8688880 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8688880 voice_square_1 0, 2, 0, 0, 15, 0 @ 868888C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688898 voice_square_1 0, 2, 0, 0, 15, 0 @ 86888A4 @@ -6645,7 +6645,7 @@ voicegroup_8688874:: @ 8688874 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688AF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8688B08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8688B14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8688B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688B20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688B2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688B38 @@ -6721,7 +6721,7 @@ voicegroup_8688874:: @ 8688874 .align 2 voicegroup_8688E74:: @ 8688E74 voice_keysplit_all voicegroup_8675FEC @ 8688E74 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8688E80 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8688E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8688E98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8688EA4 @@ -6776,7 +6776,7 @@ voicegroup_8688E74:: @ 8688E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86890F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86890FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8689108 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8689114 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8689114 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689120 voice_square_1 0, 2, 0, 0, 15, 0 @ 868912C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689138 @@ -6899,7 +6899,7 @@ voicegroup_8689474:: @ 8689474 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8689690 voice_square_1 0, 2, 0, 0, 15, 0 @ 868969C voice_square_1 0, 2, 0, 0, 15, 0 @ 86896A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86896B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86896B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86896C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86896CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86896D8 @@ -6909,7 +6909,7 @@ voicegroup_8689474:: @ 8689474 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689708 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689714 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689720 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 868972C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 868972C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689738 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689744 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689750 @@ -7030,7 +7030,7 @@ voicegroup_8689A74:: @ 8689A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689C90 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8689C9C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 8689CA8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8689CB4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8689CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CD8 @@ -7038,7 +7038,7 @@ voicegroup_8689A74:: @ 8689A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689CFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8689D08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8689D14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8689D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8689D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8689D38 @@ -7169,11 +7169,11 @@ voicegroup_868A074:: @ 868A074 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A2FC voice_square_1 0, 2, 0, 0, 15, 0 @ 868A308 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868A314 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868A314 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A320 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 868A32C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 868A32C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A338 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868A344 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868A344 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A350 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A35C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A368 @@ -7245,7 +7245,7 @@ voicegroup_868A074:: @ 868A074 .align 2 voicegroup_868A674:: @ 868A674 voice_keysplit_all voicegroup_8675FEC @ 868A674 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868A680 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868A680 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A68C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A698 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A6A4 @@ -7292,7 +7292,7 @@ voicegroup_868A674:: @ 868A674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A890 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868A89C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868A8B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868A8B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8D8 @@ -7300,11 +7300,11 @@ voicegroup_868A674:: @ 868A674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A8FC voice_square_1 0, 2, 0, 0, 15, 0 @ 868A908 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868A914 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868A914 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A920 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A92C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A938 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868A944 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868A944 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A950 voice_square_1 0, 2, 0, 0, 15, 0 @ 868A95C voice_square_1 0, 2, 0, 0, 15, 0 @ 868A968 @@ -7376,7 +7376,7 @@ voicegroup_868A674:: @ 868A674 .align 2 voicegroup_868AC74:: @ 868AC74 voice_keysplit_all voicegroup_8675FEC @ 868AC74 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868AC80 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868AC80 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AC98 voice_square_1 0, 2, 0, 0, 15, 0 @ 868ACA4 @@ -7423,7 +7423,7 @@ voicegroup_868AC74:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AE90 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868AE9C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEA8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868AEB4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868AEB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AECC voice_square_1 0, 2, 0, 0, 15, 0 @ 868AED8 @@ -7431,11 +7431,11 @@ voicegroup_868AC74:: @ 868AC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AEFC voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868AF14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868AF14 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF20 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF2C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF38 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868AF44 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868AF44 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF50 voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF5C voice_square_1 0, 2, 0, 0, 15, 0 @ 868AF68 @@ -7638,7 +7638,7 @@ voicegroup_868B274:: @ 868B274 .align 2 voicegroup_868B874:: @ 868B874 voice_keysplit_all voicegroup_8675FEC @ 868B874 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868B880 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868B880 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B88C voice_square_1 0, 2, 0, 0, 15, 0 @ 868B898 voice_square_1 0, 2, 0, 0, 15, 0 @ 868B8A4 @@ -7685,7 +7685,7 @@ voicegroup_868B874:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA90 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BA9C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868BAA8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868BAB4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868BAB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BAC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BACC voice_square_1 0, 2, 0, 0, 15, 0 @ 868BAD8 @@ -7693,11 +7693,11 @@ voicegroup_868B874:: @ 868B874 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BAF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BAFC voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB08 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868BB14 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868BB14 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB20 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 868BB2C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 868BB2C voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB38 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868BB44 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868BB44 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB50 voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB5C voice_square_1 0, 2, 0, 0, 15, 0 @ 868BB68 @@ -7824,7 +7824,7 @@ voicegroup_868BE74:: @ 868BE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C0F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C0FC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C108 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868C114 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868C114 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C120 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C12C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C138 @@ -7947,7 +7947,7 @@ voicegroup_868C474:: @ 868C474 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C690 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868C69C voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868C6B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868C6B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868C6D8 @@ -8078,7 +8078,7 @@ voicegroup_868CA74:: @ 868CA74 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868CC90 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CC9C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868CCA8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868CCB4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868CCB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CCC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CCCC voice_square_1 0, 2, 0, 0, 15, 0 @ 868CCD8 @@ -8090,7 +8090,7 @@ voicegroup_868CA74:: @ 868CA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD20 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD2C voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD38 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868CD44 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868CD44 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD50 voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD5C voice_square_1 0, 2, 0, 0, 15, 0 @ 868CD68 @@ -8162,7 +8162,7 @@ voicegroup_868CA74:: @ 868CA74 .align 2 voicegroup_868D074:: @ 868D074 voice_keysplit_all voicegroup_8675FEC @ 868D074 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868D080 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868D080 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D08C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D098 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D0A4 @@ -8209,7 +8209,7 @@ voicegroup_868D074:: @ 868D074 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868D290 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868D29C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868D2B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868D2B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D2D8 @@ -8340,7 +8340,7 @@ voicegroup_868D674:: @ 868D674 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868D890 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868D89C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868D8A8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868D8B4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868D8B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D8C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D8CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868D8D8 @@ -8352,7 +8352,7 @@ voicegroup_868D674:: @ 868D674 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D920 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D92C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D938 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868D944 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868D944 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D950 voice_square_1 0, 2, 0, 0, 15, 0 @ 868D95C voice_square_1 0, 2, 0, 0, 15, 0 @ 868D968 @@ -8424,12 +8424,12 @@ voicegroup_868D674:: @ 868D674 .align 2 voicegroup_868DC74:: @ 868DC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DC74 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868DC80 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868DC80 .align 2 voicegroup_868DC8C:: @ 868DC8C voice_keysplit_all voicegroup_8675FEC @ 868DC8C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868DC98 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868DC98 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DCA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DCB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DCBC @@ -8476,7 +8476,7 @@ voicegroup_868DC8C:: @ 868DC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEB4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868DEC0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868DECC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868DECC voice_square_1 0, 2, 0, 0, 15, 0 @ 868DED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DEF0 @@ -8484,11 +8484,11 @@ voicegroup_868DC8C:: @ 868DC8C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF08 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF14 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF20 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868DF2C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868DF2C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF44 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF50 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868DF5C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868DF5C voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF68 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF74 voice_square_1 0, 2, 0, 0, 15, 0 @ 868DF80 @@ -8560,7 +8560,7 @@ voicegroup_868DC8C:: @ 868DC8C .align 2 voicegroup_868E28C:: @ 868E28C voice_keysplit_all voicegroup_8675FEC @ 868E28C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868E298 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868E298 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E2BC @@ -8607,7 +8607,7 @@ voicegroup_868E28C:: @ 868E28C voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 868E4A8 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 868E4B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4C0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868E4CC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868E4CC voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E4F0 @@ -8617,9 +8617,9 @@ voicegroup_868E28C:: @ 868E28C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E520 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E52C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E538 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 868E544 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 868E544 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E550 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868E55C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868E55C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E568 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E574 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E580 @@ -8694,7 +8694,7 @@ voicegroup_868E67C:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E898 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868E8A4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 868E8B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868E8BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868E8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868E8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E8D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E8E0 @@ -8706,7 +8706,7 @@ voicegroup_868E67C:: @ 868E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E928 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E934 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E940 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868E94C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868E94C voice_square_1 0, 2, 0, 0, 15, 0 @ 868E958 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E964 voice_square_1 0, 2, 0, 0, 15, 0 @ 868E970 @@ -8833,7 +8833,7 @@ voicegroup_868EC7C:: @ 868EC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EF04 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EF10 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868EF1C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868EF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868EF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EF34 voice_square_1 0, 2, 0, 0, 15, 0 @ 868EF40 @@ -8956,7 +8956,7 @@ voicegroup_868F27C:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F498 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 868F4A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 868F4BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 868F4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4E0 @@ -8964,11 +8964,11 @@ voicegroup_868F27C:: @ 868F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F504 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F510 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868F51C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868F51C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F528 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F534 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F540 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868F54C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868F54C voice_square_1 0, 2, 0, 0, 15, 0 @ 868F558 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F564 voice_square_1 0, 2, 0, 0, 15, 0 @ 868F570 @@ -9095,11 +9095,11 @@ voicegroup_868F87C:: @ 868F87C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FAF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB04 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB10 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 868FB1C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 868FB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB28 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB34 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB40 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 868FB4C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 868FB4C voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB58 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB64 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FB70 @@ -9171,7 +9171,7 @@ voicegroup_868F87C:: @ 868F87C .align 2 voicegroup_868FE7C:: @ 868FE7C voice_keysplit_all voicegroup_8675FEC @ 868FE7C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 868FE88 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 868FE88 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FE94 voice_square_1 0, 2, 0, 0, 15, 0 @ 868FEA0 voice_square_2_alt 1, 1, 1, 6, 2 @ 868FEAC @@ -9218,7 +9218,7 @@ voicegroup_868FE7C:: @ 868FE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690098 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 86900A4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 86900B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86900BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86900BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86900C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86900D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86900E0 @@ -9226,11 +9226,11 @@ voicegroup_868FE7C:: @ 868FE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86900F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690104 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690110 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869011C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869011C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690128 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8690134 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8690134 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690140 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869014C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869014C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690158 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690164 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690170 @@ -9349,7 +9349,7 @@ voicegroup_869047C:: @ 869047C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690698 voice_square_1 0, 2, 0, 0, 15, 0 @ 86906A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86906B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86906BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86906BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86906C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86906D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86906E0 @@ -9361,7 +9361,7 @@ voicegroup_869047C:: @ 869047C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690728 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690734 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690740 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869074C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869074C voice_square_1 0, 2, 0, 0, 15, 0 @ 8690758 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690764 voice_square_1 0, 2, 0, 0, 15, 0 @ 8690770 @@ -9564,7 +9564,7 @@ voicegroup_8690A7C:: @ 8690A7C .align 2 voicegroup_869107C:: @ 869107C voice_keysplit_all voicegroup_8675FEC @ 869107C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8691088 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8691088 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691094 voice_square_1 0, 2, 0, 0, 15, 0 @ 86910A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86910AC @@ -9611,7 +9611,7 @@ voicegroup_869107C:: @ 869107C voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 226, 0, 38 @ 8691298 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86912A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86912B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86912BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86912BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86912C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86912D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86912E0 @@ -9621,9 +9621,9 @@ voicegroup_869107C:: @ 869107C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691310 voice_square_1 0, 2, 0, 0, 15, 0 @ 869131C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691328 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8691334 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8691334 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691340 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869134C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869134C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691358 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691364 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691370 @@ -9873,7 +9873,7 @@ voicegroup_8691C7C:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691E98 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 8691EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691EB0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8691EBC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8691EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8691EC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691ED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691EE0 @@ -9883,9 +9883,9 @@ voicegroup_8691C7C:: @ 8691C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F28 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8691F34 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8691F34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F40 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8691F4C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8691F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8691F70 @@ -10004,7 +10004,7 @@ voicegroup_869227C:: @ 869227C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692498 voice_square_1 0, 2, 0, 0, 15, 0 @ 86924A4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86924B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86924BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86924BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86924C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86924D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86924E0 @@ -10012,11 +10012,11 @@ voicegroup_869227C:: @ 869227C voice_square_1 0, 2, 0, 0, 15, 0 @ 86924F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692504 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692510 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869251C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869251C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692534 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692540 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869254C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869254C voice_square_1 0, 2, 0, 0, 15, 0 @ 8692558 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692564 voice_square_1 0, 2, 0, 0, 15, 0 @ 8692570 @@ -10274,7 +10274,7 @@ voicegroup_8692E7C:: @ 8692E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86930F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693104 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693110 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869311C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869311C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693128 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693134 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693140 @@ -10350,7 +10350,7 @@ voicegroup_8692E7C:: @ 8692E7C .align 2 voicegroup_869347C:: @ 869347C voice_keysplit_all voicegroup_8675FEC @ 869347C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8693488 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8693488 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86934A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86934AC @@ -10407,9 +10407,9 @@ voicegroup_869347C:: @ 869347C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693710 voice_square_1 0, 2, 0, 0, 15, 0 @ 869371C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693728 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8693734 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8693734 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693740 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869374C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869374C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693758 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693764 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693770 @@ -10536,9 +10536,9 @@ voicegroup_8693A7C:: @ 8693A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693CF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D10 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8693D1C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8693D1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D28 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8693D34 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8693D34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8693D58 @@ -10667,7 +10667,7 @@ voicegroup_869407C:: @ 869407C voice_square_1 0, 2, 0, 0, 15, 0 @ 86942F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694304 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694310 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869431C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869431C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694328 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694334 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694340 @@ -10798,7 +10798,7 @@ voicegroup_869467C:: @ 869467C voice_square_1 0, 2, 0, 0, 15, 0 @ 86948F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694904 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694910 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869491C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869491C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694928 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694934 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694940 @@ -10874,7 +10874,7 @@ voicegroup_869467C:: @ 869467C .align 2 voicegroup_8694C7C:: @ 8694C7C voice_keysplit_all voicegroup_8675FEC @ 8694C7C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8694C88 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8694C88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694CA0 voice_square_1_alt 0, 1, 1, 5, 2, 4 @ 8694CAC @@ -10921,7 +10921,7 @@ voicegroup_8694C7C:: @ 8694C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694E98 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8694EA4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8694EB0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8694EBC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8694EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8694EC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694ED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694EE0 @@ -10929,11 +10929,11 @@ voicegroup_8694C7C:: @ 8694C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F10 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8694F1C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8694F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F28 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 8694F34 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 8694F34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F40 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8694F4C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8694F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8694F70 @@ -11119,7 +11119,7 @@ voicegroup_869557C:: @ 869557C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695798 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 86957A4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 86957B0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86957BC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86957BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86957C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86957D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86957E0 @@ -11127,11 +11127,11 @@ voicegroup_869557C:: @ 869557C voice_square_1 0, 2, 0, 0, 15, 0 @ 86957F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695804 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695810 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869581C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869581C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695828 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695834 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695840 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869584C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869584C voice_square_1 0, 2, 0, 0, 15, 0 @ 8695858 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695864 voice_square_1 0, 2, 0, 0, 15, 0 @ 8695870 @@ -11400,7 +11400,7 @@ voicegroup_869608C:: @ 869608C .align 2 voicegroup_8696470:: @ 8696470 voice_keysplit_all voicegroup_8676148 @ 8696470 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869647C + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869647C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696488 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86964A0 @@ -11447,7 +11447,7 @@ voicegroup_8696470:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 869668C voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8696698 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 246 @ 86966A4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86966B0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86966B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86966BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86966C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86966D4 @@ -11455,11 +11455,11 @@ voicegroup_8696470:: @ 8696470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86966EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86966F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696704 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8696710 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8696710 voice_square_1 0, 2, 0, 0, 15, 0 @ 869671C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696728 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696734 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8696740 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8696740 voice_square_1 0, 2, 0, 0, 15, 0 @ 869674C voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 8696758 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696764 @@ -11578,7 +11578,7 @@ voicegroup_8696A70:: @ 8696A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696C8C voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8696C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CA4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8696CB0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8696CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696CD4 @@ -11590,7 +11590,7 @@ voicegroup_8696A70:: @ 8696A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D34 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8696D40 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8696D40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8696D64 @@ -11662,7 +11662,7 @@ voicegroup_8696A70:: @ 8696A70 .align 2 voicegroup_8697070:: @ 8697070 voice_keysplit_all voicegroup_8676658 @ 8697070 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869707C + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869707C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697088 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697094 voice_square_1 0, 2, 0, 0, 15, 0 @ 86970A0 @@ -11879,7 +11879,7 @@ voicegroup_8697670:: @ 8697670 .align 2 voicegroup_8697A54:: @ 8697A54 voice_keysplit_all voicegroup_8676148 @ 8697A54 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8697A60 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8697A60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697A6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697A78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697A84 @@ -11926,7 +11926,7 @@ voicegroup_8697A54:: @ 8697A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697C70 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8697C7C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 180, 239 @ 8697C88 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8697C94 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8697C94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CB8 @@ -11934,11 +11934,11 @@ voicegroup_8697A54:: @ 8697A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8697CE8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8697CF4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8697CF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D18 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8697D24 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8697D24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8697D48 @@ -12141,7 +12141,7 @@ voicegroup_8698054:: @ 8698054 .align 2 voicegroup_8698654:: @ 8698654 voice_keysplit_all voicegroup_86763D0 @ 8698654 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8698660 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8698660 voice_square_1 0, 2, 0, 0, 15, 0 @ 869866C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698678 voice_programmable_wave_alt ProgrammableWaveData_86B4970, 0, 7, 15, 1 @ 8698684 @@ -12188,7 +12188,7 @@ voicegroup_8698654:: @ 8698654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698870 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 869887C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698888 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8698894 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8698894 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 @@ -12200,7 +12200,7 @@ voicegroup_8698654:: @ 8698654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698900 voice_square_1 0, 2, 0, 0, 15, 0 @ 869890C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698918 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8698924 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8698924 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698930 voice_square_1 0, 2, 0, 0, 15, 0 @ 869893C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698948 @@ -12327,11 +12327,11 @@ voicegroup_8698C54:: @ 8698C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698ED0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698EDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8698EE8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8698EF4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8698EF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F18 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8698F24 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8698F24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8698F48 @@ -12450,7 +12450,7 @@ voicegroup_8699254:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699470 voice_square_1 0, 2, 0, 0, 15, 0 @ 869947C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8699488 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8699494 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8699494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86994B8 @@ -12458,11 +12458,11 @@ voicegroup_8699254:: @ 8699254 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86994DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86994E8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86994F4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86994F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699500 voice_square_1 0, 2, 0, 0, 15, 0 @ 869950C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699518 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8699524 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8699524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699530 voice_square_1 0, 2, 0, 0, 15, 0 @ 869953C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699548 @@ -12534,7 +12534,7 @@ voicegroup_8699254:: @ 8699254 .align 2 voicegroup_8699854:: @ 8699854 voice_keysplit_all voicegroup_8676148 @ 8699854 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8699860 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 128, 249, 0, 188 @ 8699884 @@ -12581,7 +12581,7 @@ voicegroup_8699854:: @ 8699854 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 8699A70 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 242 @ 8699A7C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 8699A88 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 8699A94 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 8699A94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AB8 @@ -12589,11 +12589,11 @@ voicegroup_8699854:: @ 8699854 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699ADC voice_square_1 0, 2, 0, 0, 15, 0 @ 8699AE8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 8699AF4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 8699AF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B18 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 8699B24 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 8699B24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B30 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 165, 180, 165 @ 8699B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699B48 @@ -12665,7 +12665,7 @@ voicegroup_8699854:: @ 8699854 .align 2 voicegroup_8699E54:: @ 8699E54 voice_keysplit_all voicegroup_8676148 @ 8699E54 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 8699E60 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 8699E60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8699E78 voice_square_2_alt 3, 0, 2, 6, 5 @ 8699E84 @@ -12712,7 +12712,7 @@ voicegroup_8699E54:: @ 8699E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A070 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A07C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A088 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869A094 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869A094 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0AC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0B8 @@ -12720,11 +12720,11 @@ voicegroup_8699E54:: @ 8699E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0DC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A0E8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869A0F4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869A0F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A100 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A10C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A118 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869A124 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869A124 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A130 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 869A13C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A148 @@ -12843,7 +12843,7 @@ voicegroup_869A454:: @ 869A454 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A670 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869A67C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869A688 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869A694 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869A694 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6AC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6B8 @@ -12851,11 +12851,11 @@ voicegroup_869A454:: @ 869A454 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6DC voice_square_1 0, 2, 0, 0, 15, 0 @ 869A6E8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869A6F4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869A6F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A700 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 869A70C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 869A70C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A718 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869A724 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869A724 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A730 voice_square_1 0, 2, 0, 0, 15, 0 @ 869A73C voice_square_1 0, 2, 0, 0, 15, 0 @ 869A748 @@ -12928,7 +12928,7 @@ voicegroup_869A82C:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA48 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869AA54 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869AA60 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869AA6C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869AA6C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA78 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA84 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AA90 @@ -12938,9 +12938,9 @@ voicegroup_869A82C:: @ 869A82C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AAC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AACC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AAD8 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 869AAE4 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 869AAE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AAF0 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869AAFC + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869AAFC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AB08 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AB14 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AB20 @@ -12975,7 +12975,7 @@ voicegroup_869A82C:: @ 869A82C .align 2 voicegroup_869AC70:: @ 869AC70 voice_keysplit_all voicegroup_8675FEC @ 869AC70 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869AC7C + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869AC7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AC88 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AC94 voice_square_2 0, 0, 2, 4, 1 @ 869ACA0 @@ -13022,7 +13022,7 @@ voicegroup_869AC70:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AE8C voice_directsound_no_resample 60, 0, DirectSoundWaveData_87205DC, 255, 246, 0, 226 @ 869AE98 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869AEA4 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869AEB0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869AEB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AED4 @@ -13030,11 +13030,11 @@ voicegroup_869AC70:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEEC voice_square_1 0, 2, 0, 0, 15, 0 @ 869AEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF04 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869AF10 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869AF10 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF34 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869AF40 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869AF40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF4C voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF58 voice_square_1 0, 2, 0, 0, 15, 0 @ 869AF64 @@ -13069,7 +13069,7 @@ voicegroup_869AC70:: @ 869AC70 .align 2 voicegroup_869B0B4:: @ 869B0B4 voice_keysplit_all voicegroup_8675FEC @ 869B0B4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869B0C0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869B0C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B0CC voice_square_1 0, 2, 0, 0, 15, 0 @ 869B0D8 voice_square_2 2, 0, 2, 6, 1 @ 869B0E4 @@ -13116,7 +13116,7 @@ voicegroup_869B0B4:: @ 869B0B4 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869B2D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B2DC voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869B2E8 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869B2F4 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869B2F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B300 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B30C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B318 @@ -13124,11 +13124,11 @@ voicegroup_869B0B4:: @ 869B0B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B330 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B33C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B348 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869B354 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869B354 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B360 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B36C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B378 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869B384 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869B384 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B390 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B39C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B3A8 @@ -13163,7 +13163,7 @@ voicegroup_869B0B4:: @ 869B0B4 .align 2 voicegroup_869B4F8:: @ 869B4F8 voice_keysplit_all voicegroup_8675FEC @ 869B4F8 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869B504 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869B504 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B510 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B51C voice_square_1 0, 2, 0, 0, 15, 0 @ 869B528 @@ -13210,7 +13210,7 @@ voicegroup_869B4F8:: @ 869B4F8 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869B714 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B720 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869B72C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869B738 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869B738 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B744 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B750 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B75C @@ -13218,11 +13218,11 @@ voicegroup_869B4F8:: @ 869B4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B774 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B780 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B78C - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869B798 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869B798 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7BC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869B7C8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869B7C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869B7EC @@ -13299,7 +13299,7 @@ voicegroup_869B900:: @ 869B900 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 869BB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB28 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869BB34 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869BB40 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869BB40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB4C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB58 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BB64 @@ -13311,7 +13311,7 @@ voicegroup_869B900:: @ 869B900 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBAC voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBC4 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869BBD0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869BBD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBDC voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BBF4 @@ -13386,7 +13386,7 @@ voicegroup_869BCF0:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF0C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF18 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869BF24 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869BF30 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869BF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF48 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF54 @@ -13394,11 +13394,11 @@ voicegroup_869BCF0:: @ 869BCF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF6C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF78 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF84 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869BF90 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869BF90 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BF9C voice_square_1 0, 2, 0, 0, 15, 0 @ 869BFA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BFB4 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869BFC0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869BFC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BFCC voice_square_1 0, 2, 0, 0, 15, 0 @ 869BFD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869BFE4 @@ -13470,7 +13470,7 @@ voicegroup_869BCF0:: @ 869BCF0 .align 2 voicegroup_869C2F0:: @ 869C2F0 voice_keysplit_all voicegroup_8675FEC @ 869C2F0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 869C2FC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 869C2FC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C308 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C314 voice_square_2 2, 0, 2, 3, 1 @ 869C320 @@ -13517,7 +13517,7 @@ voicegroup_869C2F0:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C50C voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 869C518 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869C524 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869C530 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869C530 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C53C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C548 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C554 @@ -13525,11 +13525,11 @@ voicegroup_869C2F0:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C56C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C578 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C584 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869C590 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869C590 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C59C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C5A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C5B4 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869C5C0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869C5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C5CC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C5D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C5E4 @@ -13607,7 +13607,7 @@ voicegroup_869C704:: @ 869C704 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C920 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C92C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869C938 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869C944 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869C944 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C950 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C95C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C968 @@ -13615,11 +13615,11 @@ voicegroup_869C704:: @ 869C704 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C980 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C98C voice_square_1 0, 2, 0, 0, 15, 0 @ 869C998 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869C9A4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869C9A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9BC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9C8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869C9D4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869C9D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9EC voice_square_1 0, 2, 0, 0, 15, 0 @ 869C9F8 @@ -13694,7 +13694,7 @@ voicegroup_869CAF4:: @ 869CAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD10 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD1C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869CD28 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869CD34 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869CD34 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD40 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD4C voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD58 @@ -13702,11 +13702,11 @@ voicegroup_869CAF4:: @ 869CAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD70 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD7C voice_square_1 0, 2, 0, 0, 15, 0 @ 869CD88 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 869CD94 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 869CD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDAC voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDB8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 869CDC4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 869CDC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDDC voice_square_1 0, 2, 0, 0, 15, 0 @ 869CDE8 @@ -13825,7 +13825,7 @@ voicegroup_869D0F4:: @ 869D0F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D310 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D31C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 869D328 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 869D334 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 869D334 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D340 voice_square_1 0, 2, 0, 0, 15, 0 @ 869D34C voice_square_1 0, 2, 0, 0, 15, 0 @ 869D358 @@ -14879,7 +14879,7 @@ voicegroup_86A0154:: @ 86A0154 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A03F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0400 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A040C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A040C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0418 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0424 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0430 @@ -15135,7 +15135,7 @@ voicegroup_86A0754:: @ 86A0754 .align 2 voicegroup_86A0FB8:: @ 86A0FB8 voice_keysplit_all voicegroup_8676148 @ 86A0FB8 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A0FC4 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A0FC4 voice_directsound 60, 0, DirectSoundWaveData_88F8318, 128, 204, 51, 242 @ 86A0FD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0FDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A0FE8 @@ -15313,7 +15313,7 @@ voicegroup_86A15B8:: @ 86A15B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A17D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A17E0 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 165, 154, 235 @ 86A17EC - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A17F8 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A17F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1804 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1810 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A181C @@ -15321,11 +15321,11 @@ voicegroup_86A15B8:: @ 86A15B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1834 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A184C - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A1858 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A1858 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1864 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A1870 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A1870 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A187C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A1888 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A1888 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1894 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A18A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A18AC @@ -15397,7 +15397,7 @@ voicegroup_86A15B8:: @ 86A15B8 .align 2 voicegroup_86A1BB8:: @ 86A1BB8 voice_keysplit_all voicegroup_8676148 @ 86A1BB8 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A1BC4 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A1BC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1BDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1BE8 @@ -15444,7 +15444,7 @@ voicegroup_86A1BB8:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1DE0 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86A1DEC - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A1DF8 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A1DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E1C @@ -15452,11 +15452,11 @@ voicegroup_86A1BB8:: @ 86A1BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E4C - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A1E58 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A1E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E7C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A1E88 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A1E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1E94 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A1EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A1EAC @@ -15575,7 +15575,7 @@ voicegroup_86A21B8:: @ 86A21B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A23D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A23E0 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86A23EC - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A23F8 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A23F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2404 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2410 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A241C @@ -15583,11 +15583,11 @@ voicegroup_86A21B8:: @ 86A21B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2434 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2440 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A244C - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A2458 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A2458 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2464 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2470 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A247C - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A2488 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A2488 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2494 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A24A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A24AC @@ -15707,7 +15707,7 @@ voicegroup_86A25F0:: @ 86A25F0 .align 2 voicegroup_86A29D4:: @ 86A29D4 voice_keysplit_all voicegroup_8676148 @ 86A29D4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A29E0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A29E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A29EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A29F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2A04 @@ -15754,7 +15754,7 @@ voicegroup_86A29D4:: @ 86A29D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2BF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2BFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2C08 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A2C14 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A2C14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2C20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2C2C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A2C38 @@ -15885,7 +15885,7 @@ voicegroup_86A2FD4:: @ 86A2FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A31F0 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 0, 242 @ 86A31FC voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86A3208 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A3214 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A3214 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3220 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A322C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3238 @@ -15893,11 +15893,11 @@ voicegroup_86A2FD4:: @ 86A2FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3250 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A325C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3268 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A3274 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A3274 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3280 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A328C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A328C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3298 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A32A4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A32A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A32B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A32BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A32C8 @@ -15969,7 +15969,7 @@ voicegroup_86A2FD4:: @ 86A2FD4 .align 2 voicegroup_86A35D4:: @ 86A35D4 voice_keysplit_all voicegroup_8676148 @ 86A35D4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A35E0 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86A3604 @@ -16016,7 +16016,7 @@ voicegroup_86A35D4:: @ 86A35D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A37F0 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A37FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3808 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A3814 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A3814 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3820 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A382C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3838 @@ -16024,7 +16024,7 @@ voicegroup_86A35D4:: @ 86A35D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3850 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A385C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3868 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A3874 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A3874 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3880 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A388C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3898 @@ -16100,7 +16100,7 @@ voicegroup_86A35D4:: @ 86A35D4 .align 2 voicegroup_86A3BD4:: @ 86A3BD4 voice_keysplit_all voicegroup_8676148 @ 86A3BD4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A3BE0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A3BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3BEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3BF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3C04 @@ -16147,7 +16147,7 @@ voicegroup_86A3BD4:: @ 86A3BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3DF0 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 226 @ 86A3DFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E08 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A3E14 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A3E14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E20 voice_square_1_alt 0, 2, 0, 2, 3, 1 @ 86A3E2C voice_square_2_alt 3, 0, 2, 7, 2 @ 86A3E38 @@ -16157,9 +16157,9 @@ voicegroup_86A3BD4:: @ 86A3BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E80 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A3E8C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A3E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3E98 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A3EA4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A3EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3EB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A3EC8 @@ -16238,7 +16238,7 @@ voicegroup_86A41D4:: @ 86A41D4 .align 2 voicegroup_86A4204:: @ 86A4204 voice_keysplit_all voicegroup_8676148 @ 86A4204 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A4210 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A4210 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A421C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4228 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4234 @@ -16285,7 +16285,7 @@ voicegroup_86A4204:: @ 86A4204 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4420 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A442C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4438 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A4444 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A4444 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4450 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A445C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4468 @@ -16293,7 +16293,7 @@ voicegroup_86A4204:: @ 86A4204 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4480 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A448C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4498 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A44A4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A44A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A44B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A44BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A44C8 @@ -16456,7 +16456,7 @@ voicegroup_86A4804:: @ 86A4804 .align 2 voicegroup_86A4BF4:: @ 86A4BF4 voice_keysplit_all voicegroup_8676148 @ 86A4BF4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A4C00 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A4C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4C0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4C24 @@ -16503,7 +16503,7 @@ voicegroup_86A4BF4:: @ 86A4BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E28 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A4E34 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A4E34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A4E58 @@ -16587,7 +16587,7 @@ voicegroup_86A4BF4:: @ 86A4BF4 .align 2 voicegroup_86A51F4:: @ 86A51F4 voice_keysplit_all voicegroup_8676148 @ 86A51F4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A5200 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A5200 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A520C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5218 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5224 @@ -16634,7 +16634,7 @@ voicegroup_86A51F4:: @ 86A51F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5410 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A541C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5428 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A5434 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A5434 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5440 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A544C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5458 @@ -16718,7 +16718,7 @@ voicegroup_86A51F4:: @ 86A51F4 .align 2 voicegroup_86A57F4:: @ 86A57F4 voice_keysplit_all voicegroup_8676148 @ 86A57F4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A5800 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86A5824 @@ -16765,7 +16765,7 @@ voicegroup_86A57F4:: @ 86A57F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A10 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A5A1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A28 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A5A34 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A5A34 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A58 @@ -16773,7 +16773,7 @@ voicegroup_86A57F4:: @ 86A57F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5A88 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A5A94 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A5A94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A5AB8 @@ -16896,7 +16896,7 @@ voicegroup_86A5DF4:: @ 86A5DF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6010 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A601C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6028 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A6034 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A6034 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6040 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A604C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6058 @@ -16980,7 +16980,7 @@ voicegroup_86A5DF4:: @ 86A5DF4 .align 2 voicegroup_86A63F4:: @ 86A63F4 voice_keysplit_all voicegroup_8675FEC @ 86A63F4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A6400 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A6400 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A640C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6418 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6424 @@ -17027,7 +17027,7 @@ voicegroup_86A63F4:: @ 86A63F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6610 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A661C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6628 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A6634 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A6634 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6640 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A664C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6658 @@ -17114,7 +17114,7 @@ voicegroup_86A67E4:: @ 86A67E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A18 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A6A24 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A6A24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A48 @@ -17124,7 +17124,7 @@ voicegroup_86A67E4:: @ 86A67E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6A90 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A6A9C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A6A9C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6AA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6AB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6AC0 @@ -17198,7 +17198,7 @@ voicegroup_86A67E4:: @ 86A67E4 .align 2 voicegroup_86A6DE4:: @ 86A6DE4 voice_keysplit_all voicegroup_86B429C @ 86A6DE4 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A6DF0 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A6DF0 voice_square_1_alt 0, 2, 0, 0, 12, 0 @ 86A6DFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A6E14 @@ -17245,7 +17245,7 @@ voicegroup_86A6DE4:: @ 86A6DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7000 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A700C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 165, 154, 153 @ 86A7018 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A7024 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A7024 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7030 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A703C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7048 @@ -17253,11 +17253,11 @@ voicegroup_86A6DE4:: @ 86A6DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7060 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A706C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7078 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A7084 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A7084 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7090 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A709C + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A709C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70A8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A70B4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A70B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A70D8 @@ -17472,7 +17472,7 @@ voicegroup_86A7840:: @ 86A7840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A68 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 127 @ 86A7A74 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A7A80 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A7A80 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7A98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7AA4 @@ -17480,11 +17480,11 @@ voicegroup_86A7840:: @ 86A7840 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7ABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7AC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7AD4 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A7AE0 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A7AE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7AEC - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A7AF8 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A7AF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7B04 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A7B10 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A7B10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7B1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7B34 @@ -17563,7 +17563,7 @@ voicegroup_86A7C60:: @ 86A7C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7E88 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A7E94 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A7EA0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A7EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EC4 @@ -17571,11 +17571,11 @@ voicegroup_86A7C60:: @ 86A7C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7EF4 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A7F00 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A7F00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7F0C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A7F18 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A7F18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7F24 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A7F30 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A7F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7F48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A7F54 @@ -17647,7 +17647,7 @@ voicegroup_86A7C60:: @ 86A7C60 .align 2 voicegroup_86A8260:: @ 86A8260 voice_keysplit_all voicegroup_8676148 @ 86A8260 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A826C + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A826C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8278 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8284 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8290 @@ -17694,7 +17694,7 @@ voicegroup_86A8260:: @ 86A8260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A847C voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86A8488 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A8494 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A84A0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A84A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84C4 @@ -17702,11 +17702,11 @@ voicegroup_86A8260:: @ 86A8260 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A84F4 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A8500 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A8500 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A850C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A8518 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A8518 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8524 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A8530 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A8530 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A853C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8548 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8554 @@ -17825,7 +17825,7 @@ voicegroup_86A8860:: @ 86A8860 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8A88 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 127, 154, 235 @ 86A8A94 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A8AA0 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A8AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AC4 @@ -17833,11 +17833,11 @@ voicegroup_86A8860:: @ 86A8860 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8ADC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8AF4 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A8B00 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A8B00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8B0C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86A8B18 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86A8B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8B24 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A8B30 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A8B30 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8B48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8B54 @@ -17874,7 +17874,7 @@ voicegroup_86A8860:: @ 86A8860 .align 2 voicegroup_86A8CBC:: @ 86A8CBC voice_keysplit_all voicegroup_8676148 @ 86A8CBC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A8CC8 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 249, 0, 165 @ 86A8CEC @@ -17921,7 +17921,7 @@ voicegroup_86A8CBC:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8EE4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86A8EF0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A8EFC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A8EFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F20 @@ -17929,11 +17929,11 @@ voicegroup_86A8CBC:: @ 86A8CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F50 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A8F5C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A8F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F80 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A8F8C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A8F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8F98 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 165, 180, 165 @ 86A8FA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8FB0 @@ -18005,7 +18005,7 @@ voicegroup_86A8CBC:: @ 86A8CBC .align 2 voicegroup_86A92BC:: @ 86A92BC voice_keysplit_all voicegroup_8676148 @ 86A92BC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A92C8 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A92C8 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 @@ -18052,7 +18052,7 @@ voicegroup_86A92BC:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A94D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A94E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A94F0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A94FC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A94FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9508 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9514 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9520 @@ -18060,11 +18060,11 @@ voicegroup_86A92BC:: @ 86A92BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9544 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9550 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A955C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A955C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9568 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9574 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9580 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A958C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A958C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9598 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A95A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A95B0 @@ -18136,7 +18136,7 @@ voicegroup_86A92BC:: @ 86A92BC .align 2 voicegroup_86A98BC:: @ 86A98BC voice_keysplit_all voicegroup_8676148 @ 86A98BC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A98C8 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86A98C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A98D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A98E0 voice_square_2_alt 3, 0, 2, 6, 5 @ 86A98EC @@ -18183,7 +18183,7 @@ voicegroup_86A98BC:: @ 86A98BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9AD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9AE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9AF0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86A9AFC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86A9AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B20 @@ -18191,11 +18191,11 @@ voicegroup_86A98BC:: @ 86A98BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B50 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86A9B5C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86A9B5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B80 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86A9B8C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86A9B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9B98 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 127 @ 86A9BA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9BB0 @@ -18267,7 +18267,7 @@ voicegroup_86A98BC:: @ 86A98BC .align 2 voicegroup_86A9EBC:: @ 86A9EBC voice_keysplit_all voicegroup_8676148 @ 86A9EBC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86A9EC8 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 249, 0, 165 @ 86A9EEC @@ -18314,7 +18314,7 @@ voicegroup_86A9EBC:: @ 86A9EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA0E4 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86AA0F0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AA0FC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AA0FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA108 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA114 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA120 @@ -18322,11 +18322,11 @@ voicegroup_86A9EBC:: @ 86A9EBC voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 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 voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AA15C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AA15C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA168 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA174 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA180 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86AA18C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86AA18C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA198 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 236, 188 @ 86AA1A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA1B0 @@ -18445,7 +18445,7 @@ voicegroup_86AA4BC:: @ 86AA4BC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA6D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA6E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA6F0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AA6FC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AA6FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA708 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA714 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AA720 @@ -18576,7 +18576,7 @@ voicegroup_86AAABC:: @ 86AAABC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AACD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AACE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AACF0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AACFC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AACFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAD08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAD14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAD20 @@ -18620,7 +18620,7 @@ voicegroup_86AAABC:: @ 86AAABC .align 2 voicegroup_86AAEDC:: @ 86AAEDC voice_keysplit_all voicegroup_8676148 @ 86AAEDC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AAEE8 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86AAEE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAEF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AAF0C @@ -18667,7 +18667,7 @@ voicegroup_86AAEDC:: @ 86AAEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB0F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB104 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB110 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AB11C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AB11C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB128 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB134 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB140 @@ -18675,9 +18675,9 @@ voicegroup_86AAEDC:: @ 86AAEDC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB158 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB164 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB170 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AB17C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AB17C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB188 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86AB194 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86AB194 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB1A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB1AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB1B8 @@ -18798,7 +18798,7 @@ voicegroup_86AB4DC:: @ 86AB4DC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB6F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB704 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB710 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AB71C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AB71C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB728 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB734 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AB740 @@ -18847,7 +18847,7 @@ voicegroup_86AB4DC:: @ 86AB4DC .align 2 voicegroup_86AB938:: @ 86AB938 voice_keysplit_all voicegroup_8676148 @ 86AB938 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AB944 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86AB968 @@ -18894,7 +18894,7 @@ voicegroup_86AB938:: @ 86AB938 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB54 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86ABB60 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB6C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86ABB78 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86ABB78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABB9C @@ -18902,7 +18902,7 @@ voicegroup_86AB938:: @ 86AB938 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABBB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABBC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABBCC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86ABBD8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86ABBD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABBE4 voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204 @ 86ABBF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ABBFC @@ -18978,7 +18978,7 @@ voicegroup_86AB938:: @ 86AB938 .align 2 voicegroup_86ABF38:: @ 86ABF38 voice_keysplit_all voicegroup_8676148 @ 86ABF38 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86ABF44 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 128, 180, 108, 209 @ 86ABF68 @@ -19025,7 +19025,7 @@ voicegroup_86ABF38:: @ 86ABF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC154 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AC160 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC16C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AC178 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AC178 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC184 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC190 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC19C @@ -19109,7 +19109,7 @@ voicegroup_86ABF38:: @ 86ABF38 .align 2 voicegroup_86AC538:: @ 86AC538 voice_keysplit_all voicegroup_8676148 @ 86AC538 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AC544 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86AC544 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC550 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC55C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC568 @@ -19156,7 +19156,7 @@ voicegroup_86AC538:: @ 86AC538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC754 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 242, 51, 226 @ 86AC760 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC76C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AC778 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AC778 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC784 voice_square_1_alt 0, 2, 0, 2, 10, 1 @ 86AC790 voice_square_2_alt 2, 0, 2, 6, 6 @ 86AC79C @@ -19166,9 +19166,9 @@ voicegroup_86AC538:: @ 86AC538 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC7CC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC7D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC7E4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86AC7F0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86AC7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC7FC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86AC808 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86AC808 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC814 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC820 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AC82C @@ -19240,7 +19240,7 @@ voicegroup_86AC538:: @ 86AC538 .align 2 voicegroup_86ACB38:: @ 86ACB38 voice_keysplit_all voicegroup_8676148 @ 86ACB38 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86ACB44 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86ACB44 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACB50 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACB5C voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACB68 @@ -19287,7 +19287,7 @@ voicegroup_86ACB38:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD60 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 153 @ 86ACD6C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86ACD78 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86ACD78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD90 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACD9C @@ -19295,11 +19295,11 @@ voicegroup_86ACB38:: @ 86ACB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDCC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86ACDD8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86ACDD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACDFC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86ACE08 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86ACE08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE14 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 236, 188 @ 86ACE20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ACE2C @@ -19426,7 +19426,7 @@ voicegroup_86AD138:: @ 86AD138 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3CC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AD3D8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AD3D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD3FC @@ -19502,7 +19502,7 @@ voicegroup_86AD138:: @ 86AD138 .align 2 voicegroup_86AD738:: @ 86AD738 voice_keysplit_all voicegroup_8676148 @ 86AD738 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AD744 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86AD768 @@ -19549,7 +19549,7 @@ voicegroup_86AD738:: @ 86AD738 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86AD954 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AD960 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD96C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AD978 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AD978 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD984 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD990 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD99C @@ -19561,7 +19561,7 @@ voicegroup_86AD738:: @ 86AD738 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD9E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AD9FC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86ADA08 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86ADA08 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA14 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA20 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADA2C @@ -19688,9 +19688,9 @@ voicegroup_86ADD38:: @ 86ADD38 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADFC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADFCC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86ADFD8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86ADFD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADFE4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86ADFF0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86ADFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86ADFFC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE008 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE014 @@ -19819,9 +19819,9 @@ voicegroup_86AE338:: @ 86AE338 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE5CC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AE5D8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AE5D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE5E4 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86AE5F0 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86AE5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE5FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE608 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE614 @@ -19898,7 +19898,7 @@ voicegroup_86AE728:: @ 86AE728 voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86AE944 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE950 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86AE95C - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AE968 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AE968 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE974 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE980 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE98C @@ -19906,11 +19906,11 @@ voicegroup_86AE728:: @ 86AE728 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9BC - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AE9C8 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AE9C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AE9EC - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86AE9F8 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86AE9F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA04 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEA1C @@ -19945,7 +19945,7 @@ voicegroup_86AE728:: @ 86AE728 .align 2 voicegroup_86AEB6C:: @ 86AEB6C voice_keysplit_all voicegroup_8676148 @ 86AEB6C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AEB78 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86AEB9C @@ -19992,7 +19992,7 @@ voicegroup_86AEB6C:: @ 86AEB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AED88 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86AED94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDA0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AEDAC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AEDAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDD0 @@ -20000,7 +20000,7 @@ voicegroup_86AEB6C:: @ 86AEB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEDF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEE00 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AEE0C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AEE0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEE18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AEE30 @@ -20076,7 +20076,7 @@ voicegroup_86AEB6C:: @ 86AEB6C .align 2 voicegroup_86AF16C:: @ 86AF16C voice_keysplit_all voicegroup_8676148 @ 86AF16C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AF178 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86AF19C @@ -20123,7 +20123,7 @@ voicegroup_86AF16C:: @ 86AF16C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF388 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF394 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF3A0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AF3AC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AF3AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF3B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF3C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF3D0 @@ -20207,7 +20207,7 @@ voicegroup_86AF16C:: @ 86AF16C .align 2 voicegroup_86AF76C:: @ 86AF76C voice_keysplit_all voicegroup_8676148 @ 86AF76C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86AF778 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86AF778 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 @@ -20254,7 +20254,7 @@ voicegroup_86AF76C:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF988 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF994 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9A0 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86AF9AC + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86AF9AC voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9D0 @@ -20262,11 +20262,11 @@ voicegroup_86AF76C:: @ 86AF76C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AF9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA00 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86AFA0C + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86AFA0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA18 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA24 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA30 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86AFA3C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86AFA3C voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA48 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 209 @ 86AFA54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86AFA60 @@ -20658,7 +20658,7 @@ voicegroup_86B07B0:: @ 86B07B0 voicegroup_86B0BD0:: @ 86B0BD0 voice_keysplit_all voicegroup_86B0378 @ 86B0BD0 voice_keysplit_all voicegroup_86B0138 @ 86B0BDC - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B0BE8 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86B0BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0C0C @@ -20704,7 +20704,7 @@ voicegroup_86B0BD0:: @ 86B0BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0DEC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E04 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B0E10 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B0E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E34 @@ -20712,11 +20712,11 @@ voicegroup_86B0BD0:: @ 86B0BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E64 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86B0E70 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86B0E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E7C - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86B0E88 + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86B0E88 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0E94 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86B0EA0 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86B0EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0EAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0EC4 @@ -20748,7 +20748,7 @@ voicegroup_86B0BD0:: @ 86B0BD0 .align 2 voicegroup_86B0FF0:: @ 86B0FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B0FF0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B0FFC + voice_keysplit voicegroup_8676A90, 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_871CBCC, 64, 249, 0, 188 @ 86B1020 @@ -20879,7 +20879,7 @@ voicegroup_86B0FF0:: @ 86B0FF0 .align 2 voicegroup_86B15F0:: @ 86B15F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B15F0 - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B15FC + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86B15FC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1608 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1614 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1620 @@ -20976,7 +20976,7 @@ voicegroup_86B1824:: @ 86B1824 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A40 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A4C voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 0, 193, 76 @ 86B1A58 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B1A64 + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B1A64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1A88 @@ -20984,11 +20984,11 @@ voicegroup_86B1824:: @ 86B1824 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1AB8 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86B1AC4 + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86B1AC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1AD0 - voice_keysplit voicegroup_8677108, KeySplitTable_86B477C @ 86B1ADC + voice_keysplit voicegroup_8677108, KeySplitTable4 @ 86B1ADC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1AE8 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86B1AF4 + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86B1AF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1B00 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1B0C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B1B18 @@ -21287,7 +21287,7 @@ voicegroup_86B264C:: @ 86B264C voice_directsound 60, 0, DirectSoundWaveData_8726EF0, 255, 216, 0, 165 @ 86B2868 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2874 voice_directsound 60, 0, DirectSoundWaveData_86B9318, 255, 246, 0, 226 @ 86B2880 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B288C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B288C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2898 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28B0 @@ -21295,11 +21295,11 @@ voicegroup_86B264C:: @ 86B264C voice_directsound 60, 0, DirectSoundWaveData_86BA7E8, 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 voicegroup_8676AE4, KeySplitTable_86B4728 @ 86B28EC + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86B28EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B28F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2904 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2910 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86B291C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86B291C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2928 voice_directsound 60, 0, DirectSoundWaveData_870DE64, 255, 0, 255, 209 @ 86B2934 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2940 @@ -21371,7 +21371,7 @@ voicegroup_86B264C:: @ 86B264C .align 2 voicegroup_86B2C4C:: @ 86B2C4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2C4C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B2C58 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86B2C58 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2C64 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2C70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B2C7C @@ -21502,7 +21502,7 @@ voicegroup_86B2C4C:: @ 86B2C4C .align 2 voicegroup_86B324C:: @ 86B324C voice_keysplit_all voicegroup_8676148 @ 86B324C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B3258 + voice_keysplit voicegroup_8676A90, KeySplitTable1 @ 86B3258 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3264 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3270 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B327C @@ -21549,7 +21549,7 @@ voicegroup_86B324C:: @ 86B324C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3468 voice_directsound 60, 0, DirectSoundWaveData_873D874, 255, 246, 0, 235 @ 86B3474 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3480 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B348C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B348C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3498 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34B0 @@ -21557,11 +21557,11 @@ voicegroup_86B324C:: @ 86B324C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34E0 - voice_keysplit voicegroup_8676AE4, KeySplitTable_86B4728 @ 86B34EC + voice_keysplit voicegroup_8676AE4, KeySplitTable3 @ 86B34EC voice_square_1 0, 2, 0, 0, 15, 0 @ 86B34F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3504 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3510 - voice_keysplit voicegroup_8677120, KeySplitTable_86B47C4 @ 86B351C + voice_keysplit voicegroup_8677120, KeySplitTable5 @ 86B351C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3528 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3534 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3540 @@ -21633,7 +21633,7 @@ voicegroup_86B324C:: @ 86B324C .align 2 voicegroup_86B384C:: @ 86B384C voice_keysplit_all voicegroup_8676148 @ 86B384C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B3858 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86B387C @@ -21680,7 +21680,7 @@ voicegroup_86B384C:: @ 86B384C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A68 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A80 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B3A8C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B3A8C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3A98 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3AA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B3AB0 @@ -21764,7 +21764,7 @@ voicegroup_86B384C:: @ 86B384C .align 2 voicegroup_86B3E4C:: @ 86B3E4C voice_keysplit_all voicegroup_8676148 @ 86B3E4C - voice_keysplit voicegroup_8676A90, KeySplitTable_86B4698 @ 86B3E58 + voice_keysplit voicegroup_8676A90, 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_871CBCC, 255, 188, 128, 226 @ 86B3E7C @@ -21811,7 +21811,7 @@ voicegroup_86B3E4C:: @ 86B3E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4068 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4074 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4080 - voice_keysplit voicegroup_8676AC0, KeySplitTable_86B46E0 @ 86B408C + voice_keysplit voicegroup_8676AC0, KeySplitTable2 @ 86B408C voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4098 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B40A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B40B0 @@ -21943,3 +21943,6 @@ voicegroup_86B429C:: @ 86B429C voice_directsound_no_resample 64, 39, DirectSoundWaveData_86DAA94, 255, 165, 103, 188 @ 86B4674 voice_directsound_no_resample 64, 64, DirectSoundWaveData_86DB908, 255, 0, 255, 0 @ 86B4680 voice_square_1 0, 2, 0, 0, 15, 0 @ 86B468C + voice_square_1 0, 2, 0, 0, 15, 0 @ 86B4698 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_86DD11C, 255, 0, 255, 0 @ 86B46A4 + voice_directsound 63, 64, DirectSoundWaveData_86DE6C0, 255, 0, 255, 0 @ 86B46B0 diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 74247f8a2..1201a855a 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -369,7 +369,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_FIRST_BATTLE; else if (gBattleTypeFlags & BATTLE_TYPE_FACTORY) AI_THINKING_STRUCT->aiFlags = GetAiScriptsInBattleFactory(); - else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE)) + else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_SECRET_BASE)) AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_TRY_TO_FAINT; else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags | gTrainers[gTrainerBattleOpponent_B].aiFlags; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index b3179ed3d..c490ad314 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -40,7 +40,7 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern u8 GetFrontierBrainTrainerPicIndex(void); -extern u8 sub_81D5588(u16 trainerId); +extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); extern u8 GetEreaderTrainerFrontSpriteId(void); @@ -1236,18 +1236,18 @@ static void OpponentHandleDrawTrainerPic(void) { trainerPicId = GetFrontierBrainTrainerPicIndex(); } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { if (gActiveBattler == 1) - trainerPicId = sub_81D5588(gTrainerBattleOpponent_A); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_A); else - trainerPicId = sub_81D5588(gTrainerBattleOpponent_B); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_B); } else { - trainerPicId = sub_81D5588(gTrainerBattleOpponent_A); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_A); } } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) @@ -1320,18 +1320,18 @@ static void OpponentHandleTrainerSlide(void) { trainerPicId = GetFrontierBrainTrainerPicIndex(); } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { if (gActiveBattler == 1) - trainerPicId = sub_81D5588(gTrainerBattleOpponent_A); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_A); else - trainerPicId = sub_81D5588(gTrainerBattleOpponent_B); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_B); } else { - trainerPicId = sub_81D5588(gTrainerBattleOpponent_A); + trainerPicId = GetTrainerHillTrainerFrontSpriteId(gTrainerBattleOpponent_A); } } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) @@ -1998,7 +1998,7 @@ static void OpponentHandleResetActionMoveSelection(void) static void OpponentHandleCmd55(void) { - if (gBattleTypeFlags & BATTLE_TYPE_LINK && !(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (gBattleTypeFlags & BATTLE_TYPE_LINK && !(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) { gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index aab804b41..898e18294 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -687,7 +687,7 @@ static void SafariHandleCmd55(void) FadeOutMapMusic(5); BeginFastPaletteFade(3); SafariBufferExecCompleted(); - if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 747aa2987..80dd6d3bb 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1560,7 +1560,7 @@ static void WallyHandleCmd55(void) BeginFastPaletteFade(3); WallyBufferExecCompleted(); - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD) && gBattleTypeFlags & BATTLE_TYPE_LINK) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) && gBattleTypeFlags & BATTLE_TYPE_LINK) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 4d714ca81..63154ae8b 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -330,7 +330,7 @@ static void InitSinglePlayerBtlControllers(void) } } } - else if (gBattleTypeFlags & BATTLE_TYPE_WILD) + else if (gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) { gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; @@ -391,7 +391,7 @@ static void InitLinkBtlControllers(void) if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - if (gBattleTypeFlags & BATTLE_TYPE_WILD) + if (gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) { gBattleMainFunc = BeginBattleIntro; @@ -416,7 +416,7 @@ static void InitLinkBtlControllers(void) } else if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - if (gBattleTypeFlags & BATTLE_TYPE_WILD) + if (gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) { gBattleMainFunc = BeginBattleIntro; @@ -453,7 +453,7 @@ static void InitLinkBtlControllers(void) } else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) { - if (gBattleTypeFlags & BATTLE_TYPE_WILD) + if (gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) { gBattleMainFunc = BeginBattleIntro; @@ -501,7 +501,7 @@ static void InitLinkBtlControllers(void) { multiplayerId = GetMultiplayerId(); - if (gBattleTypeFlags & BATTLE_TYPE_WILD) + if (gBattleTypeFlags & BATTLE_TYPE_IS_MASTER) gBattleMainFunc = BeginBattleIntro; for (i = 0; i < MAX_BATTLERS_COUNT; i++) @@ -700,14 +700,14 @@ static void CreateTasksForSendRecvLinkBuffers(void) enum { LINK_BUFF_BUFFER_ID, - LINK_BUFF_ACTIVE_BANK, + LINK_BUFF_ACTIVE_BATTLER, LINK_BUFF_ATTACKER, LINK_BUFF_TARGET, LINK_BUFF_SIZE_LO, LINK_BUFF_SIZE_HI, - LINK_BUFF_ABSENT_BANK_FLAGS, - LINK_BUFF_EFFECT_BANK, - LINK_BUFF_DATA + LINK_BUFF_ABSENT_BATTLER_FLAGS, + LINK_BUFF_EFFECT_BATTLER, + LINK_BUFF_DATA, }; void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data) @@ -722,13 +722,13 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data) gTasks[gUnknown_02022D08].data[14] = 0; } gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBattler; + gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler; gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker; gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattlerTarget; gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize; gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBattlerFlags; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BANK] = gEffectBattler; + gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags; + gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler; for (i = 0; i < size; i++) gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_DATA + i] = data[i]; @@ -877,7 +877,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) gTasks[taskId].data[12] = 0; gTasks[taskId].data[15] = 0; } - battlerId = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ACTIVE_BANK]; + battlerId = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ACTIVE_BATTLER]; blockSize = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_LO] | (gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_HI] << 8); switch (gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 0]) @@ -886,19 +886,19 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) if (gBattleControllerExecFlags & gBitTable[battlerId]) return; - memcpy(gBattleBufferA[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize); + memcpy(gBattleBufferA[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA], blockSize); sub_803F850(battlerId); - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) { - gBattlerAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2]; - gBattlerTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3]; - gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6]; - gEffectBattler = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7]; + gBattlerAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ATTACKER]; + gBattlerTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_TARGET]; + gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ABSENT_BATTLER_FLAGS]; + gEffectBattler = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_EFFECT_BATTLER]; } break; case 1: - memcpy(gBattleBufferB[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize); + memcpy(gBattleBufferB[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA], blockSize); break; case 2: var = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA]; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 23ed8a19f..b4dcf586d 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -47,11 +47,11 @@ extern const u32 gUnknown_08C093F0[]; extern const u32 gSubstituteDollTilemap[]; extern const u32 gSubstituteDollGfx[]; extern const u16 gSubstituteDollPal[]; -extern const u8 gUnknown_08C1F1C8[]; -extern const u8 gUnknown_08C1F46C[]; -extern const u8 gUnknown_08C1F5E8[]; -extern const u8 gUnknown_08C1F76C[]; -extern const u8 gUnknown_08C1F8E8[]; +extern const u8 gHealthboxSinglesPlayerGfx[]; +extern const u8 gHealthboxSinglesOpponentGfx[]; +extern const u8 gHealthboxDoublesPlayerGfx[]; +extern const u8 gHealthboxDoublesOpponentGfx[]; +extern const u8 gHealthboxSafariGfx[]; extern const u8 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; @@ -72,29 +72,29 @@ static void ClearSpritesBattlerHealthboxAnimData(void); // const rom data static const struct CompressedSpriteSheet sSpriteSheet_SinglesPlayerHealthbox = { - gUnknown_08C1F1C8, 0x1000, TAG_HEALTHBOX_PLAYER1_TILE + gHealthboxSinglesPlayerGfx, 0x1000, TAG_HEALTHBOX_PLAYER1_TILE }; static const struct CompressedSpriteSheet sSpriteSheet_SinglesOpponentHealthbox = { - gUnknown_08C1F46C, 0x1000, TAG_HEALTHBOX_OPPONENT1_TILE + gHealthboxSinglesOpponentGfx, 0x1000, TAG_HEALTHBOX_OPPONENT1_TILE }; static const struct CompressedSpriteSheet sSpriteSheets_DoublesPlayerHealthbox[2] = { - {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER1_TILE}, - {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER2_TILE} + {gHealthboxDoublesPlayerGfx, 0x800, TAG_HEALTHBOX_PLAYER1_TILE}, + {gHealthboxDoublesPlayerGfx, 0x800, TAG_HEALTHBOX_PLAYER2_TILE} }; static const struct CompressedSpriteSheet sSpriteSheets_DoublesOpponentHealthbox[2] = { - {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT1_TILE}, - {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT2_TILE} + {gHealthboxDoublesOpponentGfx, 0x800, TAG_HEALTHBOX_OPPONENT1_TILE}, + {gHealthboxDoublesOpponentGfx, 0x800, TAG_HEALTHBOX_OPPONENT2_TILE} }; static const struct CompressedSpriteSheet sSpriteSheet_SafariHealthbox = { - gUnknown_08C1F8E8, 0x1000, TAG_HEALTHBOX_SAFARI_TILE + gHealthboxSafariGfx, 0x1000, TAG_HEALTHBOX_SAFARI_TILE }; static const struct CompressedSpriteSheet sSpriteSheets_HealthBar[MAX_BATTLERS_COUNT] = diff --git a/src/battle_main.c b/src/battle_main.c index 781fbeff4..12e49ee65 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -877,7 +877,7 @@ static void sub_8036EB8(u8 arg0, u8 arg1) if (gBlockRecvBuffer[0][0] == 256) { if (arg1 == 0) - gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER | BATTLE_TYPE_TRAINER; else gBattleTypeFlags |= BATTLE_TYPE_TRAINER; var++; @@ -896,7 +896,7 @@ static void sub_8036EB8(u8 arg0, u8 arg1) if (i == arg0) { if (arg1 == 0) - gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER | BATTLE_TYPE_TRAINER; else gBattleTypeFlags |= BATTLE_TYPE_TRAINER; var++; @@ -916,7 +916,7 @@ static void sub_8036EB8(u8 arg0, u8 arg1) } if (i == arg0) - gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER | BATTLE_TYPE_TRAINER; else gBattleTypeFlags |= BATTLE_TYPE_TRAINER; } @@ -979,7 +979,7 @@ static void CB2_HandleStartBattle(void) else { if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) - gBattleTypeFlags |= BATTLE_TYPE_WILD; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER; gBattleCommunication[MULTIUSE_STATE] = 15; SetAllPlayersBerryData(); } @@ -1087,7 +1087,7 @@ static void CB2_HandleStartBattle(void) if ((GetBlockReceivedStatus() & 3) == 3) { ResetBlockReceivedFlags(); - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed)); gBattleCommunication[MULTIUSE_STATE]++; } @@ -1181,7 +1181,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) else { if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) - gBattleTypeFlags |= BATTLE_TYPE_WILD; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER; gBattleCommunication[MULTIUSE_STATE] = 13; SetAllPlayersBerryData(); } @@ -1340,7 +1340,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) if ((GetBlockReceivedStatus() & 3) == 3) { ResetBlockReceivedFlags(); - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed)); gBattleCommunication[MULTIUSE_STATE]++; } @@ -1568,7 +1568,7 @@ static void CB2_HandleStartMultiBattle(void) else { if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) - gBattleTypeFlags |= BATTLE_TYPE_WILD; + gBattleTypeFlags |= BATTLE_TYPE_IS_MASTER; gBattleCommunication[MULTIUSE_STATE] = 7; SetAllPlayersBerryData(); } @@ -1920,7 +1920,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_x4000000))) + | BATTLE_TYPE_TRAINER_HILL))) { if (firstTrainer == TRUE) ZeroEnemyPartyMons(); @@ -3302,7 +3302,7 @@ static void BattleIntroGetMonsData(void) { case 0: gActiveBattler = gBattleCommunication[1]; - BtlController_EmitGetMonData(0, 0, 0); + BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0); MarkBattlerForControllerExec(gActiveBattler); gBattleCommunication[MULTIUSE_STATE]++; break; @@ -3385,7 +3385,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 - | BATTLE_TYPE_x4000000))) + | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); } @@ -3398,7 +3398,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 - | BATTLE_TYPE_x4000000))) + | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); } @@ -3709,7 +3709,7 @@ static void BattleIntroRecordMonsToDex(void) | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 - | BATTLE_TYPE_x4000000))) + | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); } @@ -4326,7 +4326,7 @@ static void HandleTurnActionSelectionState(void) } if (gBattleTypeFlags & BATTLE_TYPE_TRAINER - && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000) + && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { gSelectionBattleScripts[gActiveBattler] = BattleScript_AskIfWantsToForfeitMatch; @@ -4597,7 +4597,7 @@ static void sub_803CDF8(void) void SwapTurnOrder(u8 id1, u8 id2) { u32 temp; - + SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); } @@ -4978,7 +4978,7 @@ static void HandleEndTurn_BattleWon(void) gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER - && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER)) + && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_EREADER_TRAINER)) { BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; @@ -5069,7 +5069,7 @@ static void HandleEndTurn_RanFromBattle(void) gBattleOutcome = B_OUTCOME_FORFEITED; gSaveBlock2Ptr->frontier.field_CA9_b = 1; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited; gBattleOutcome = B_OUTCOME_FORFEITED; @@ -5624,7 +5624,7 @@ bool8 TryRunFromBattle(u8 battler) effect++; } } - else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000) && gBattleTypeFlags & BATTLE_TYPE_TRAINER) + else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL) && gBattleTypeFlags & BATTLE_TYPE_TRAINER) { effect++; } diff --git a/src/battle_message.c b/src/battle_message.c index 78b9ac53b..a5f549733 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -17,6 +17,7 @@ #include "menu.h" #include "recorded_battle.h" #include "international_string_util.h" +#include "battle_frontier_2.h" struct BattleWindowText { @@ -46,13 +47,12 @@ extern const u8 gText_PkmnTransferredLanettesPC[]; extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2 extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower -extern u8 sub_81D5530(u16 trainerId); // pokenav +extern u8 GetTrainerHillOpponentClass(u16 trainerId); // pokenav extern u8 GetEreaderTrainerClassId(void); // battle_tower extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2 -extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav +extern void GetTrainerHillTrainerName(u8 *txtPtr, u16 trainerId); // pokenav extern void GetEreaderTrainerName(u8 *txtPtr); -extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2 -extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav +extern void CopyTrainerHillTrainerText(u8 arg0, u16 trainerId); // pokenav extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); // this file's functions @@ -334,14 +334,14 @@ static const u8 sText_GotAwaySafely[] = _("{PLAY_SE 0x0011}Got away safely!\p"); static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); static const u8 sText_WildPkmnFled[] = _("{PLAY_SE 0x0011}Wild {B_BUFF1} fled!"); -static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_20}!"); -static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_20}\nand {B_21}!"); -static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_20}!"); -static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_20}\nand {B_21}!"); -static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_20}!"); -static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_20} and {B_21}!"); -static const u8 sText_WildFled[] = _("{PLAY_SE 0x0011}{B_20} fled!"); -static const u8 sText_TwoWildFled[] = _("{PLAY_SE 0x0011}{B_20} and\n{B_21} fled!"); +static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!"); +static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); +static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!"); +static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); +static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!"); +static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); +static const u8 sText_WildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} fled!"); +static const u8 sText_TwoWildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); static const u8 sText_NoRunningFromTrainers[] = _("No! There’s no running\nfrom a TRAINER battle!\p"); static const u8 sText_CantEscape[] = _("Can’t escape!\p"); static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don’t leave me like this!\p"); @@ -398,33 +398,33 @@ static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appea static const u8 sText_WildPkmnAppearedPause[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!{PAUSE 127}"); static const u8 sText_TwoWildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} and\n{B_OPPONENT_MON2_NAME} appeared!\p"); static const u8 sText_Trainer1WantsToBattle[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nwould like to battle!\p"); -static const u8 sText_LinkTrainerWantsToBattle[] = _("{B_20}\nwants to battle!"); -static const u8 sText_TwoLinkTrainersWantToBattle[] = _("{B_20} and {B_21}\nwant to battle!"); +static const u8 sText_LinkTrainerWantsToBattle[] = _("{B_LINK_OPPONENT1_NAME}\nwants to battle!"); +static const u8 sText_TwoLinkTrainersWantToBattle[] = _("{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}\nwant to battle!"); static const u8 sText_Trainer1SentOutPkmn[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\nout {B_OPPONENT_MON1_NAME}!"); static const u8 sText_Trainer1SentOutTwoPkmn[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\nout {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!"); static const u8 sText_Trainer1SentOutPkmn2[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\nout {B_BUFF1}!"); -static const u8 sText_LinkTrainerSentOutPkmn[] = _("{B_20} sent out\n{B_OPPONENT_MON1_NAME}!"); -static const u8 sText_LinkTrainerSentOutTwoPkmn[] = _("{B_20} sent out\n{B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!"); -static const u8 sText_TwoLinkTrainersSentOutPkmn[] = _("{B_20} sent out {B_LINK_OPPONENT_MON1_NAME}!\n{B_21} sent out {B_LINK_OPPONENT_MON2_NAME}!"); -static const u8 sText_LinkTrainerSentOutPkmn2[] = _("{B_20} sent out\n{B_BUFF1}!"); -static const u8 sText_LinkTrainerMultiSentOutPkmn[] = _("{B_22} sent out\n{B_BUFF1}!"); +static const u8 sText_LinkTrainerSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out\n{B_OPPONENT_MON1_NAME}!"); +static const u8 sText_LinkTrainerSentOutTwoPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out\n{B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!"); +static const u8 sText_TwoLinkTrainersSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out {B_LINK_OPPONENT_MON1_NAME}!\n{B_LINK_OPPONENT2_NAME} sent out {B_LINK_OPPONENT_MON2_NAME}!"); +static const u8 sText_LinkTrainerSentOutPkmn2[] = _("{B_LINK_OPPONENT1_NAME} sent out\n{B_BUFF1}!"); +static const u8 sText_LinkTrainerMultiSentOutPkmn[] = _("{B_LINK_SCR_TRAINER_NAME} sent out\n{B_BUFF1}!"); static const u8 sText_GoPkmn[] = _("Go! {B_PLAYER_MON1_NAME}!"); static const u8 sText_GoTwoPkmn[] = _("Go! {B_PLAYER_MON1_NAME} and\n{B_PLAYER_MON2_NAME}!"); static const u8 sText_GoPkmn2[] = _("Go! {B_BUFF1}!"); static const u8 sText_DoItPkmn[] = _("Do it! {B_BUFF1}!"); static const u8 sText_GoForItPkmn[] = _("Go for it, {B_BUFF1}!"); static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your foe’s weak!\nGet ’em, {B_BUFF1}!"); -static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_1F} sent out {B_LINK_PLAYER_MON2_NAME}!\nGo! {B_LINK_PLAYER_MON1_NAME}!"); +static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_LINK_PARTNER_NAME} sent out {B_LINK_PLAYER_MON2_NAME}!\nGo! {B_LINK_PLAYER_MON1_NAME}!"); static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that’s enough!\nCome back!"); static const u8 sText_PkmnComeBack[] = _("{B_BUFF1}, come back!"); static const u8 sText_PkmnOkComeBack[] = _("{B_BUFF1}, OK!\nCome back!"); static const u8 sText_PkmnGoodComeBack[] = _("{B_BUFF1}, good!\nCome back!"); static const u8 sText_Trainer1WithdrewPkmn[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nwithdrew {B_BUFF1}!"); -static const u8 sText_LinkTrainer1WithdrewPkmn[] = _("{B_20} withdrew\n{B_BUFF1}!"); -static const u8 sText_LinkTrainer2WithdrewPkmn[] = _("{B_22} withdrew\n{B_BUFF1}!"); +static const u8 sText_LinkTrainer1WithdrewPkmn[] = _("{B_LINK_OPPONENT1_NAME} withdrew\n{B_BUFF1}!"); +static const u8 sText_LinkTrainer2WithdrewPkmn[] = _("{B_LINK_SCR_TRAINER_NAME} withdrew\n{B_BUFF1}!"); static const u8 sText_WildPkmnPrefix[] = _("Wild "); static const u8 sText_FoePkmnPrefix[] = _("Foe "); -static const u8 sText_EmptyString8[] = _( ""); +static const u8 sText_EmptyString8[] = _(""); static const u8 sText_FoePkmnPrefix2[] = _("Foe"); static const u8 sText_AllyPkmnPrefix[] = _("Ally"); static const u8 sText_FoePkmnPrefix3[] = _("Foe"); @@ -1321,8 +1321,8 @@ static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_T static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?"); const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}’s battle result was recorded\non the FRONTIER PASS."); -static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_20}\nwants to battle!{PAUSE 49}"); -static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_20} and {B_21}\nwant to battle!{PAUSE 49}"); +static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_LINK_OPPONENT1_NAME}\nwants to battle!{PAUSE 49}"); +static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}\nwant to battle!{PAUSE 49}"); // This is four lists of moves which use a different attack string in Japanese // to the default. See the documentation for ChooseTypeOfMoveUsedString for more detail. @@ -2303,13 +2303,13 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) u32 dstID = 0; // if they used dstID, why not use srcID as well? const u8 *toCpy = NULL; u8 text[30]; - u8 multiplayerID; + u8 multiplayerId; s32 i; if (gBattleTypeFlags & BATTLE_TYPE_x2000000) - multiplayerID = gUnknown_0203C7B4; + multiplayerId = gUnknown_0203C7B4; else - multiplayerID = GetMultiplayerId(); + multiplayerId = GetMultiplayerId(); while (*src != EOS) { @@ -2383,25 +2383,25 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = text; break; case B_TXT_LINK_PLAYER_MON1_NAME: // link first player poke name - GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id]], + GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerId].id]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_OPPONENT_MON1_NAME: // link first opponent poke name - GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 1]], + GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerId].id ^ 1]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_PLAYER_MON2_NAME: // link second player poke name - GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 2]], + GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerId].id ^ 2]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_OPPONENT_MON2_NAME: // link second opponent poke name - GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 3]], + GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerId].id ^ 3]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; @@ -2513,8 +2513,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gTrainerClassNames[GetFrontierBrainTrainerClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) toCpy = gTrainerClassNames[GetFrontierOpponentClass(gTrainerBattleOpponent_A)]; - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) - toCpy = gTrainerClassNames[sub_81D5530(gTrainerBattleOpponent_A)]; + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) + toCpy = gTrainerClassNames[GetTrainerHillOpponentClass(gTrainerBattleOpponent_A)]; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) toCpy = gTrainerClassNames[GetEreaderTrainerClassId()]; else @@ -2531,7 +2531,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) { - toCpy = gLinkPlayers[multiplayerID ^ BIT_SIDE].name; + toCpy = gLinkPlayers[multiplayerId ^ BIT_SIDE].name; } else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { @@ -2543,9 +2543,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) GetFrontierTrainerName(text, gTrainerBattleOpponent_A); toCpy = text; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D5554(text, gTrainerBattleOpponent_A); + GetTrainerHillTrainerName(text, gTrainerBattleOpponent_A); toCpy = text; } else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) @@ -2558,19 +2558,19 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gTrainers[gTrainerBattleOpponent_A].trainerName; } break; - case B_TXT_1E: // link player name? - toCpy = gLinkPlayers[multiplayerID].name; + case B_TXT_LINK_PLAYER_NAME: // link player name + toCpy = gLinkPlayers[multiplayerId].name; break; - case B_TXT_1F: // link partner name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].id)].name; + case B_TXT_LINK_PARTNER_NAME: // link partner name + toCpy = gLinkPlayers[GetBattlerMultiplayerId(BATTLE_PARTNER(gLinkPlayers[multiplayerId].id))].name; break; - case B_TXT_20: // link opponent 1 name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].id)].name; + case B_TXT_LINK_OPPONENT1_NAME: // link opponent 1 name + toCpy = gLinkPlayers[GetBattlerMultiplayerId(BATTLE_OPPOSITE(gLinkPlayers[multiplayerId].id))].name; break; - case B_TXT_21: // link opponent 2 name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].id)].name; + case B_TXT_LINK_OPPONENT2_NAME: // link opponent 2 name + toCpy = gLinkPlayers[GetBattlerMultiplayerId(BATTLE_PARTNER(BATTLE_OPPOSITE(gLinkPlayers[multiplayerId].id)))].name; break; - case B_TXT_22: // link scripting active name + case B_TXT_LINK_SCR_TRAINER_NAME: // link scripting active name toCpy = gLinkPlayers[GetBattlerMultiplayerId(gBattleScripting.battler)].name; break; case B_TXT_PLAYER_NAME: // player name @@ -2582,12 +2582,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - sub_81A36D0(2, gTrainerBattleOpponent_A); + CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_A); toCpy = gStringVar4; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D572C(4, gTrainerBattleOpponent_A); + CopyTrainerHillTrainerText(4, gTrainerBattleOpponent_A); toCpy = gStringVar4; } else @@ -2598,12 +2598,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - sub_81A36D0(1, gTrainerBattleOpponent_A); + CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_A); toCpy = gStringVar4; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D572C(3, gTrainerBattleOpponent_A); + CopyTrainerHillTrainerText(3, gTrainerBattleOpponent_A); toCpy = gStringVar4; } break; @@ -2655,8 +2655,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER2_CLASS: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) toCpy = gTrainerClassNames[GetFrontierOpponentClass(gTrainerBattleOpponent_B)]; - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) - toCpy = gTrainerClassNames[sub_81D5530(gTrainerBattleOpponent_B)]; + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) + toCpy = gTrainerClassNames[GetTrainerHillOpponentClass(gTrainerBattleOpponent_B)]; else toCpy = gTrainerClassNames[gTrainers[gTrainerBattleOpponent_B].trainerClass]; break; @@ -2666,9 +2666,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) GetFrontierTrainerName(text, gTrainerBattleOpponent_B); toCpy = text; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D5554(text, gTrainerBattleOpponent_B); + GetTrainerHillTrainerName(text, gTrainerBattleOpponent_B); toCpy = text; } else @@ -2679,12 +2679,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER2_LOSE_TEXT: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - sub_81A36D0(2, gTrainerBattleOpponent_B); + CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_B); toCpy = gStringVar4; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D572C(4, gTrainerBattleOpponent_B); + CopyTrainerHillTrainerText(4, gTrainerBattleOpponent_B); toCpy = gStringVar4; } else @@ -2695,12 +2695,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER2_WIN_TEXT: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - sub_81A36D0(1, gTrainerBattleOpponent_B); + CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_B); toCpy = gStringVar4; } - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { - sub_81D572C(3, gTrainerBattleOpponent_B); + CopyTrainerHillTrainerText(3, gTrainerBattleOpponent_B); toCpy = gStringVar4; } break; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 44194deda..90dacc8cb 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2739,7 +2739,7 @@ void SetMoveEffect(bool8 primary, u8 certain) break; case MOVE_EFFECT_STEAL_ITEM: { - if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { gBattlescriptCurrInstr++; break; @@ -3268,7 +3268,7 @@ static void atk23_getexp(void) if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 - | BATTLE_TYPE_x4000000 + | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER @@ -4987,7 +4987,7 @@ static void atk4E_switchinanim(void) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000 - | BATTLE_TYPE_x4000000 + | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_FRONTIER))) HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); @@ -9405,7 +9405,7 @@ static void atkD1_trysethelpinghand(void) static void atkD2_tryswapitems(void) // trick { // opponent can't swap items with player in regular battles - if (gBattleTypeFlags & BATTLE_TYPE_x4000000 + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER diff --git a/src/battle_setup.c b/src/battle_setup.c index 17ab20ccd..89a3d9a2c 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -75,7 +75,7 @@ extern void sub_81D6384(void); extern void sub_81D61E8(void); extern void sub_80982B8(void); extern void sub_81A9EDC(u16 a0); -extern void sub_81D572C(u8 a0, u16 arg1); +extern void CopyTrainerHillTrainerText(u8 a0, u16 arg1); // this file's functions static void DoBattlePikeWildBattle(void); @@ -1281,7 +1281,7 @@ void BattleSetup_StartTrainerBattle(void) } else if (sub_81D5C18()) { - gBattleTypeFlags |= BATTLE_TYPE_x4000000; + gBattleTypeFlags |= BATTLE_TYPE_TRAINER_HILL; if (gNoOfApproachingTrainers == 2) sub_81D639C(); @@ -1370,9 +1370,9 @@ void ShowTrainerIntroSpeech(void) else if (sub_81D5C18()) { if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) - sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked)); + CopyTrainerHillTrainerText(2, sub_81D6180(gSpecialVar_LastTalked)); else - sub_81D572C(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyTrainerHillTrainerText(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); sub_80982B8(); } diff --git a/src/battle_util2.c b/src/battle_util2.c index 1d2f1e95b..5881abf25 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -19,7 +19,7 @@ void AllocateBattleResources(void) { gBattleResources = gBattleResources; // something dumb needed to match - if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) sub_81D55D0(); gBattleStruct = AllocZeroed(sizeof(*gBattleStruct)); @@ -49,7 +49,7 @@ void AllocateBattleResources(void) void FreeBattleResources(void) { - if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) sub_81D5694(); if (gBattleResources != NULL) diff --git a/src/graphics.c b/src/graphics.c index 38a79ce3c..5debb721a 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -643,11 +643,11 @@ const u8 gBattleAnimSpritePalette_187[] = INCBIN_U8("graphics/battle_anims/sprit const u8 gBattleAnimSpriteSheet_186[] = INCBIN_U8("graphics/battle_anims/sprites/186.4bpp.lz"); const u8 gBattleAnimSpritePalette_186[] = INCBIN_U8("graphics/battle_anims/sprites/186.gbapal.lz"); -const u8 gUnknown_08C1F1C8[] = INCBIN_U8("graphics/battle_interface/window.4bpp.lz"); -const u8 gUnknown_08C1F46C[] = INCBIN_U8("graphics/battle_interface/window2.4bpp.lz"); -const u8 gUnknown_08C1F5E8[] = INCBIN_U8( "graphics/battle_interface/window3.4bpp.lz"); -const u8 gUnknown_08C1F76C[] = INCBIN_U8("graphics/battle_interface/window4.4bpp.lz"); -const u8 gUnknown_08C1F8E8[] = INCBIN_U8("graphics/battle_interface/window5.4bpp.lz"); +const u8 gHealthboxSinglesPlayerGfx[] = INCBIN_U8("graphics/battle_interface/healthbox_singles_player.4bpp.lz"); +const u8 gHealthboxSinglesOpponentGfx[] = INCBIN_U8("graphics/battle_interface/healthbox_singles_opponent.4bpp.lz"); +const u8 gHealthboxDoublesPlayerGfx[] = INCBIN_U8( "graphics/battle_interface/healthbox_doubles_player.4bpp.lz"); +const u8 gHealthboxDoublesOpponentGfx[] = INCBIN_U8("graphics/battle_interface/healthbox_doubles_opponent.4bpp.lz"); +const u8 gHealthboxSafariGfx[] = INCBIN_U8("graphics/battle_interface/healthbox_safari.4bpp.lz"); const u8 gUnusedGfx_Shadow[] = INCBIN_U8("graphics/unused/shadow.4bpp.lz"); const u8 gUnusedPal_Shadow[] = INCBIN_U8("graphics/unused/shadow.gbapal.lz"); diff --git a/src/pokemon.c b/src/pokemon.c index 78a7a55a5..8e2e3b764 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5307,7 +5307,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov // I have to re-use this variable to match. r5 = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitGetMonData(0, 0, 0); + BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0); MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } @@ -6621,7 +6621,7 @@ u16 GetBattleBGM(void) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A); - else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) trainerClass = TRAINER_CLASS_EXPERT; else trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; diff --git a/src/recorded_battle.c b/src/recorded_battle.c index fc3b8b94a..355ed5e07 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -19,7 +19,7 @@ #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE \ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ - | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ + | BATTLE_TYPE_RECORDED | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_SECRET_BASE \ | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)) extern u8 gUnknown_03001278; @@ -273,7 +273,7 @@ void sub_81851A8(u8 *arg0) return; } - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) { for (var2 = *arg0; var2 != 0;) { @@ -360,7 +360,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); battleSave->battleFlags |= BATTLE_TYPE_x2000000; - if (sBattleFlags & BATTLE_TYPE_WILD) + if (sBattleFlags & BATTLE_TYPE_IS_MASTER) { battleSave->battleFlags |= BATTLE_TYPE_x80000000; } diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 06c5e6852..7f7a8a3c4 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1,4 +1,3 @@ - // Includes #include "global.h" #include "palette.h" @@ -8,6 +7,9 @@ #include "battle_transition.h" #include "fieldmap.h" +#define SECONDARY_TILESET_VRAM 0x2000 +#define TILE_VRAM(n) (0x20 * (n)) + // Static type declarations // Static RAM declarations @@ -720,22 +722,22 @@ void TilesetCb_InsideBuilding(void) static void sub_80A0B70(u16 timer) { - static void sub_80A0BCC(u16); - static void sub_80A0BF4(u16); - static void sub_80A0C1C(u16); - static void sub_80A0C44(u16); - static void sub_80A12AC(u16); + static void gTilesetAnims_Flower(u16); + static void gTilesetAnims_Water(u16); + static void gTilesetAnims_SandWaterEdge(u16); + static void gTilesetAnims_Waterfall(u16); + static void gTilesetAnims_LandWaterEdge (u16); if ((timer & 0x0F) == 0) - sub_80A0BCC(timer >> 4); + gTilesetAnims_Flower(timer >> 4); if ((timer & 0x0F) == 1) - sub_80A0BF4(timer >> 4); + gTilesetAnims_Water(timer >> 4); if ((timer & 0x0F) == 2) - sub_80A0C1C(timer >> 4); + gTilesetAnims_SandWaterEdge(timer >> 4); if ((timer & 0x0F) == 3) - sub_80A0C44(timer >> 4); + gTilesetAnims_Waterfall(timer >> 4); if ((timer & 0x0F) == 4) - sub_80A12AC(timer >> 4); + gTilesetAnims_LandWaterEdge (timer >> 4); } static void sub_80A0BB4(u16 timer) @@ -746,7 +748,7 @@ static void sub_80A0BB4(u16 timer) sub_80A1688(timer >> 3); } -static void sub_80A0BCC(u16 timer) +static void gTilesetAnims_Flower(u16 timer) { u16 idx; @@ -754,7 +756,7 @@ static void sub_80A0BCC(u16 timer) AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); } -static void sub_80A0BF4(u16 timer) +static void gTilesetAnims_Water(u16 timer) { u8 idx; @@ -762,7 +764,7 @@ static void sub_80A0BF4(u16 timer) AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); } -static void sub_80A0C1C(u16 timer) +static void gTilesetAnims_SandWaterEdge(u16 timer) { u16 idx; @@ -770,7 +772,7 @@ static void sub_80A0C1C(u16 timer) AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); } -static void sub_80A0C44(u16 timer) +static void gTilesetAnims_Waterfall(u16 timer) { u16 idx; @@ -1123,7 +1125,7 @@ static void sub_80A1294(u16 timer) sub_80A1570(timer >> 3); } -static void sub_80A12AC(u16 timer) +static void gTilesetAnims_LandWaterEdge (u16 timer) { u16 idx; |
