diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index d748135e3c..6aa832511d 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1462,8 +1462,9 @@ .endm @ Used by effects that may proc Symbiosis but do not call removeitem. - .macro trysymbiosis + .macro trysymbiosis battler:req callnative BS_TrySymbiosis + .byte \battler .endm @ returns B_SIDE_x to gBattleCommunication[0] diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d505841f7c..c52635ec77 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1,52 +1,55 @@ + .set ALLOCATE_SCRIPT_CMD_TABLE, 0 + .include "data/script_cmd_table.inc" + @ Does nothing. .macro nop - .byte 0x00 + .byte SCR_OP_NOP .endm @ Does nothing. .macro nop1 - .byte 0x01 + .byte SCR_OP_NOP1 .endm @ Terminates script execution. .macro end - .byte 0x02 + .byte SCR_OP_END .endm @ Jumps back to after the last-executed call statement, and continues script execution from there. .macro return - .byte 0x03 + .byte SCR_OP_RETURN .endm @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. .macro call destination:req - .byte 0x04 + .byte SCR_OP_CALL .4byte \destination .endm @ Jumps to destination and continues script execution from there. .macro goto destination:req - .byte 0x05 + .byte SCR_OP_GOTO .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. .macro goto_if condition:req, destination:req - .byte 0x06 + .byte SCR_OP_GOTO_IF .byte \condition .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), calls destination. .macro call_if condition:req, destination:req - .byte 0x07 + .byte SCR_OP_CALL_IF .byte \condition .4byte \destination .endm @ Jumps to the script in gStdScripts at index function. .macro gotostd function:req - .byte 0x08 + .byte SCR_OP_GOTO_STD .byte \function .endm @@ -58,120 +61,120 @@ @ Calls the script in gStdScripts at index function. .macro callstd function:req - .byte 0x09 + .byte SCR_OP_CALL_STD .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to the script in gStdScripts at index function. .macro gotostd_if condition:req, function:req - .byte 0x0a + .byte SCR_OP_GOTO_STD_IF .byte \condition .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), calls the script in gStdScripts at index function. .macro callstd_if condition:req, function:req - .byte 0x0b + .byte SCR_OP_CALL_STD_IF .byte \condition .byte \function .endm @ Equivalent to the 'return' command for a RAM script. .macro returnram - .byte 0x0c + .byte SCR_OP_RETURNRAM .endm @ Equivalent to the 'end' command for a RAM script. .macro endram - .byte 0x0d + .byte SCR_OP_ENDRAM .endm @ Sets the Mystery Event script status (MEVENT_STATUS_*). .macro setmysteryeventstatus value:req - .byte 0x0e + .byte SCR_OP_SETMYSTERYEVENTSTATUS .byte \value .endm @ Sets the value at the specified script data index to a fixed 4-byte value. .macro loadword destIndex:req, value:req - .byte 0x0f + .byte SCR_OP_LOAD_WORD .byte \destIndex .4byte \value .endm @ Sets the value at the specified script data index to a fixed byte value. .macro loadbyte destIndex:req, value:req - .byte 0x10 + .byte SCR_OP_LOAD_BYTE .byte \destIndex .byte \value .endm @ Sets the value at the specified pointer. .macro setptr value:req, ptr:req - .byte 0x11 + .byte SCR_OP_SETPTR .byte \value .4byte \ptr .endm @ Sets the value at the specified script data index to the value at pointer 'source'. .macro loadbytefromptr destIndex:req, source:req - .byte 0x12 + .byte SCR_OP_LOADBYTEFROMPTR .byte \destIndex .4byte \source .endm @ Sets the value at pointer 'destination' to the contents of the script data at 'srcIndex'. .macro setptrbyte srcIndex:req, destination:req - .byte 0x13 + .byte SCR_OP_SETPTRBYTE .byte \srcIndex .4byte \destination .endm @ Copies the contents of the script data from one index to another. .macro copylocal destIndex:req, srcIndex:req - .byte 0x14 + .byte SCR_OP_COPYLOCAL .byte \destIndex .byte \srcIndex .endm @ Copies the byte at source to destination, replacing whatever byte was previously there. .macro copybyte destination:req, source:req - .byte 0x15 + .byte SCR_OP_COPYBYTE .4byte \destination .4byte \source .endm @ Changes the value of destination to value. .macro setvar destination:req, value:req - .byte 0x16 + .byte SCR_OP_SETVAR .2byte \destination .2byte \value .endm @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). .macro addvar destination:req, value:req - .byte 0x17 + .byte SCR_OP_ADDVAR .2byte \destination .2byte \value .endm @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). .macro subvar destination:req, value:req - .byte 0x18 + .byte SCR_OP_SUBVAR .2byte \destination .2byte \value .endm @ Copies the value of source into destination. .macro copyvar destination:req, source:req - .byte 0x19 + .byte SCR_OP_COPYVAR .2byte \destination .2byte \source .endm @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. .macro setorcopyvar destination:req, source:req - .byte 0x1a + .byte SCR_OP_SETORCOPYVAR .2byte \destination .2byte \source .endm @@ -179,7 +182,7 @@ @ Compares the values of the script data at indexes 'local1' and 'local2'. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_local_to_local local1:req, local2:req - .byte 0x1b + .byte SCR_OP_COMPARE_LOCAL_TO_LOCAL .byte \local1 .byte \local2 .endm @@ -187,7 +190,7 @@ @ Compares the value of the script data at index 'local' to a fixed value. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_local_to_value local:req, value:req - .byte 0x1c + .byte SCR_OP_COMPARE_LOCAL_TO_VALUE .byte \local .byte \value .endm @@ -195,7 +198,7 @@ @ Compares the value of the script data at index 'local' to the value at 'ptr' @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_local_to_ptr local:req, ptr:req - .byte 0x1d + .byte SCR_OP_COMPARE_LOCAL_TO_PTR .byte \local .4byte \ptr .endm @@ -203,7 +206,7 @@ @ Compares the value at 'ptr' to the value of the script data at index 'local'. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_ptr_to_local ptr:req, local:req - .byte 0x1e + .byte SCR_OP_COMPARE_PTR_TO_LOCAL .4byte \ptr .byte \local .endm @@ -211,7 +214,7 @@ @ Compares the value at 'ptr' to a fixed value. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_ptr_to_value ptr:req, value:req - .byte 0x1f + .byte SCR_OP_COMPARE_PTR_TO_VALUE .4byte \ptr .byte \value .endm @@ -219,7 +222,7 @@ @ Compares the value at 'ptr1' to the value at 'ptr2'. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_ptr_to_ptr ptr1:req, ptr2:req - .byte 0x20 + .byte SCR_OP_COMPARE_PTR_TO_PTR .4byte \ptr1 .4byte \ptr2 .endm @@ -227,7 +230,7 @@ @ Compares the value of 'var' to a fixed value. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_var_to_value var:req, value:req - .byte 0x21 + .byte SCR_OP_COMPARE_VAR_TO_VALUE .2byte \var .2byte \value .endm @@ -235,7 +238,7 @@ @ Compares the value of 'var1' to the value of 'var2'. @ The result is stored in comparisonResult to be acted on by goto_if / call_if .macro compare_var_to_var var1:req, var2:req - .byte 0x22 + .byte SCR_OP_COMPARE_VAR_TO_VAR .2byte \var1 .2byte \var2 .endm @@ -255,7 +258,7 @@ @ contains a call to 'Script_RequestEffects', which allows them @ to be analyzed by 'RunScriptImmediatelyUntilEffect'. .macro callnative func:req, requests_effects=0 - .byte 0x23 + .byte SCR_OP_CALLNATIVE .if \requests_effects == 0 .4byte \func .else @@ -265,7 +268,7 @@ @ Replaces the script with the function stored at func. Execution returns to the bytecode script when func returns TRUE. .macro gotonative func:req, requests_effects=0 - .byte 0x24 + .byte SCR_OP_GOTONATIVE .if \requests_effects == 0 .4byte \func .else @@ -275,14 +278,14 @@ @ Calls a function listed in the table in data/specials.inc. .macro special function:req - .byte 0x25 + .byte SCR_OP_SPECIAL .2byte SPECIAL_\function .endm @ Calls a function listed in the table in data/specials.inc. @ That function's output (if any) will be written to the variable specified by 'output'. .macro specialvar output:req, function:req - .byte 0x26 + .byte SCR_OP_SPECIALVAR .2byte \output .2byte SPECIAL_\function .endm @@ -290,77 +293,77 @@ @ Blocks script execution until a command or C code manually unblocks it. Generally used with specific @ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue. .macro waitstate - .byte 0x27 + .byte SCR_OP_WAITSTATE .endm @ Blocks script execution for frames. (Pokemon Emerald runs at just shy of 60 frames per second.) .macro delay frames:req - .byte 0x28 + .byte SCR_OP_DELAY .2byte \frames .endm @ Sets flag to TRUE. .macro setflag flag:req - .byte 0x29 + .byte SCR_OP_SETFLAG .2byte \flag .endm @ Sets flag to FALSE. .macro clearflag flag:req - .byte 0x2a + .byte SCR_OP_CLEARFLAG .2byte \flag .endm @ Compares flag to TRUE and stores the result in comparisonResult to be used by goto_if, etc @ See additional _if_unset and _if_set macros .macro checkflag flag:req - .byte 0x2b + .byte SCR_OP_CHECKFLAG .2byte \flag .endm @ Initializes the RTC`s local time offset to the given hour and minute. .macro initclock hour:req, minute:req - .byte 0x2c + .byte SCR_OP_INITCLOCK .2byte \hour .2byte \minute .endm @ Updates local time using the RTC and runs time based events. .macro dotimebasedevents - .byte 0x2d + .byte SCR_OP_DOTIMEBASEDEVENTS .endm @ Sets the values of variables VAR_0x8000, VAR_0x8001, and VAR_0x8002 to the current hour, minute, and second. .macro gettime - .byte 0x2e + .byte SCR_OP_GETTIME .endm @ Plays the specified sound. Only one sound may play at a time, with newer ones interrupting older ones. .macro playse song:req - .byte 0x2f + .byte SCR_OP_PLAYSE .2byte \song .endm @ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing. .macro waitse - .byte 0x30 + .byte SCR_OP_WAITSE .endm @ Plays the fanfare specified by the song number. If the specified song is not a fanfare it will instead play the first song in sFanfares. .macro playfanfare song:req - .byte 0x31 + .byte SCR_OP_PLAYFANFARE .2byte \song .endm @ Blocks script execution until all currently-playing fanfares finish. .macro waitfanfare - .byte 0x32 + .byte SCR_OP_WAITFANFARE .endm @ Plays the specified song. If save_song is TRUE, the @ specified song will be saved as if savebgm was called with it. .macro playbgm song:req, save_song:req - .byte 0x33 + .byte SCR_OP_PLAYBGM .2byte \song .byte \save_song .endm @@ -368,30 +371,30 @@ @ Saves the specified song to be played later. Saved music may be played when Overworld_PlaySpecialMapMusic is called. This occurs on @ exiting most warps. .macro savebgm song:req - .byte 0x34 + .byte SCR_OP_SAVEBGM .2byte \song .endm @ Crossfades the currently-playing song into the map's default song. .macro fadedefaultbgm - .byte 0x35 + .byte SCR_OP_FADEDEFAULTBGM .endm @ Crossfades the currently-playing song into the specified song. .macro fadenewbgm song:req - .byte 0x36 + .byte SCR_OP_FADENEWBGM .2byte \song .endm @ Fades out the currently-playing song. .macro fadeoutbgm speed:req - .byte 0x37 + .byte SCR_OP_FADEOUTBGM .byte \speed .endm @ Fades the previously-playing song back in. .macro fadeinbgm speed:req - .byte 0x38 + .byte SCR_OP_FADEINBGM .byte \speed .endm @@ -435,7 +438,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warp map:req, a, b, c - .byte 0x39 + .byte SCR_OP_WARP formatwarp \map, \a, \b, \c .endm @@ -443,7 +446,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpsilent map:req, a, b, c - .byte 0x3a + .byte SCR_OP_WARPSILENT formatwarp \map, \a, \b, \c .endm @@ -451,7 +454,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpdoor map:req, a, b, c - .byte 0x3b + .byte SCR_OP_WARPDOOR formatwarp \map, \a, \b, \c .endm @@ -459,7 +462,7 @@ @ use the map set by setholewarp. In either case the target coordinates on the destination map will be the @ player's current position. .macro warphole map:req - .byte 0x3c + .byte SCR_OP_WARPHOLE map \map .endm @@ -468,7 +471,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpteleport map:req, a, b, c - .byte 0x3d + .byte SCR_OP_WARPTELEPORT formatwarp \map, \a, \b, \c .endm @@ -476,7 +479,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setwarp map:req, a, b, c - .byte 0x3e + .byte SCR_OP_SETWARP formatwarp \map, \a, \b, \c .endm @@ -484,7 +487,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setdynamicwarp map:req, a, b, c - .byte 0x3f + .byte SCR_OP_SETDYNAMICWARP formatwarp \map, \a, \b, \c .endm @@ -494,7 +497,7 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setdivewarp map:req, a, b, c - .byte 0x40 + .byte SCR_OP_SETDIVEWARP formatwarp \map, \a, \b, \c .endm @@ -505,26 +508,26 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setholewarp map:req, a=0, b=0, c - .byte 0x41 + .byte SCR_OP_SETHOLEWARP formatwarp \map, \a, \b, \c .endm @ Retrieves the player's zero-indexed x- and y-coordinates in the map, and stores them in the specified variables. .macro getplayerxy x:req, y:req - .byte 0x42 + .byte SCR_OP_GETPLAYERXY .2byte \x .2byte \y .endm @ Retrieves the number of Pokemon in the player's party, and stores that number in VAR_RESULT. .macro getpartysize - .byte 0x43 + .byte SCR_OP_GETPARTYSIZE .endm @ Attempts to add quantity of the specified item to the player's Bag. If the player has enough room, the item will @ be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE. .macro additem itemId:req, quantity=1 - .byte 0x44 + .byte SCR_OP_ADDITEM .2byte \itemId .2byte \quantity .endm @@ -532,7 +535,7 @@ @ Removes quantity of the specified item from the player's Bag. If the player has fewer than 'quantity' in their bag @ then none will be removed and VAR_RESULT will be set to FALSE. Otherwise it will be set to TRUE. .macro removeitem itemId:req, quantity=1 - .byte 0x45 + .byte SCR_OP_REMOVEITEM .2byte \itemId .2byte \quantity .endm @@ -540,7 +543,7 @@ @ Checks if the player has enough space in their Bag to hold quantity more of the specified item. Sets VAR_RESULT to @ TRUE if there is room, or FALSE is there is no room. .macro checkitemspace itemId:req, quantity=1 - .byte 0x46 + .byte SCR_OP_CHECKITEMSPACE .2byte \itemId .2byte \quantity .endm @@ -548,7 +551,7 @@ @ Checks if the player has quantity or more of the specified item in their Bag. Sets VAR_RESULT to TRUE if the player has @ enough of the item, or FALSE if they have fewer than quantity of the item. .macro checkitem itemId:req, quantity=1 - .byte 0x47 + .byte SCR_OP_CHECKITEM .2byte \itemId .2byte \quantity .endm @@ -556,58 +559,58 @@ @ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. @ This is used to show the name of the proper Bag pocket when the player receives an item via callstd. .macro checkitemtype itemId:req - .byte 0x48 + .byte SCR_OP_CHECKITEMTYPE .2byte \itemId .endm @ Adds quantity of the specified item to the player's PC. .macro addpcitem itemId:req, quantity=1 - .byte 0x49 + .byte SCR_OP_ADDPCITEM .2byte \itemId .2byte \quantity .endm @ Checks for quantity of the specified item in the player's PC. .macro checkpcitem itemId:req, quantity=1 - .byte 0x4a + .byte SCR_OP_CHECKPCITEM .2byte \itemId .2byte \quantity .endm @ Adds a decoration to the player's PC. .macro adddecoration decoration:req - .byte 0x4b + .byte SCR_OP_ADDDECORATION .2byte \decoration .endm @ Removes a decoration from the player's PC. .macro removedecoration decoration:req - .byte 0x4c + .byte SCR_OP_REMOVEDECORATION .2byte \decoration .endm @ Checks for decoration in the player's PC. .macro checkdecor decoration:req - .byte 0x4d + .byte SCR_OP_CHECKDECOR .2byte \decoration .endm @ Checks if the player has enough space in their PC to hold the decoration. @ Sets VAR_RESULT to TRUE if there is room, or FALSE is there is no room. .macro checkdecorspace decoration:req - .byte 0x4e + .byte SCR_OP_CHECKDECORSPACE .2byte \decoration .endm @ Applies the movement data at movements to the specified (localId) object. If no map is specified, then the current map is used. .macro applymovement localId:req, movements:req, map .ifb \map - .byte 0x4f + .byte SCR_OP_APPLYMOVEMENT .2byte \localId .4byte \movements .else @ Really only useful if the object has followed from one map to another (e.g. Wally during the catching event). - .byte 0x50 + .byte SCR_OP_APPLYMOVEMENTAT .2byte \localId .4byte \movements map \map @@ -620,10 +623,10 @@ @ If no map is specified, then the current map is used. .macro waitmovement localId:req, map .ifb \map - .byte 0x51 + .byte SCR_OP_WAITMOVEMENT .2byte \localId .else - .byte 0x52 + .byte SCR_OP_WAITMOVEMENTAT .2byte \localId map \map .endif @@ -634,10 +637,10 @@ @ If no map is specified, then the current map is used. .macro removeobject localId:req, map .ifb \map - .byte 0x53 + .byte SCR_OP_REMOVEOBJECT .2byte \localId .else - .byte 0x54 + .byte SCR_OP_REMOVEOBJECTAT .2byte \localId map \map .endif @@ -648,10 +651,10 @@ @ If no map is specified, then the current map is used. .macro addobject localId:req, map .ifb \map - .byte 0x55 + .byte SCR_OP_ADDOBJECT .2byte \localId .else - .byte 0x56 + .byte SCR_OP_ADDOBJECTAT .2byte \localId map \map .endif @@ -659,7 +662,7 @@ @ Sets the specified (localId) object's position on the current map. .macro setobjectxy localId:req, x:req, y:req - .byte 0x57 + .byte SCR_OP_SETOBJECTXY .2byte \localId .2byte \x .2byte \y @@ -667,33 +670,33 @@ @ Sets the specified object's invisibility to FALSE. .macro showobjectat localId:req, map:req - .byte 0x58 + .byte SCR_OP_SHOWOBJECTAT .2byte \localId map \map .endm @ Sets the specified object's invisibility to TRUE. .macro hideobjectat localId:req, map:req - .byte 0x59 + .byte SCR_OP_HIDEOBJECTAT .2byte \localId map \map .endm @ Turns the currently selected object (if there is one) to face the player. .macro faceplayer - .byte 0x5a + .byte SCR_OP_FACEPLAYER .endm @ Turns the specified object in the specified direction. .macro turnobject localId:req, direction:req - .byte 0x5b + .byte SCR_OP_TURNOBJECT .2byte \localId .byte \direction .endm @ Configures the arguments for a trainer battle, then jumps to the appropriate script in scripts/trainer_battle.inc .macro trainerbattle type:req, trainer:req, local_id:req, pointer1:req, pointer2, pointer3, pointer4 - .byte 0x5c + .byte SCR_OP_TRAINERBATTLE .byte \type .2byte \trainer .2byte \local_id @@ -801,41 +804,41 @@ @ Starts a trainer battle using the battle information stored in RAM (usually by the scripts in trainer_battle.inc, which @ are run by trainerbattle), and blocks script execution until the battle finishes. .macro dotrainerbattle - .byte 0x5d + .byte SCR_OP_DOTRAINERBATTLE .endm @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) .macro gotopostbattlescript - .byte 0x5e + .byte SCR_OP_GOTOPOSTBATTLESCRIPT .endm @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) .macro gotobeatenscript - .byte 0x5f + .byte SCR_OP_GOTOBEATENSCRIPT .endm @ Checks if the trainer has been defeated by the player (by comparing the flag 'trainer + TRAINER_FLAGS_START' to TRUE). .macro checktrainerflag trainer:req - .byte 0x60 + .byte SCR_OP_CHECKTRAINERFLAG .2byte \trainer .endm @ Sets the trainer flag (trainer + TRAINER_FLAGS_START) to TRUE (defeated). .macro settrainerflag trainer:req - .byte 0x61 + .byte SCR_OP_SETTRAINERFLAG .2byte \trainer .endm @ Sets the trainer flag (trainer + TRAINER_FLAGS_START) to FALSE (not defeated). .macro cleartrainerflag trainer:req - .byte 0x62 + .byte SCR_OP_CLEARTRAINERFLAG .2byte \trainer .endm @ Sets the coordinates of an object's template, so that if the sprite goes off screen @ it'll still be there when it comes back on screen. .macro setobjectxyperm localId:req, x:req, y:req - .byte 0x63 + .byte SCR_OP_SETOBJECTXYPERM .2byte \localId .2byte \x .2byte \y @@ -844,13 +847,13 @@ @ Copies a live object event's xy position to its template, so that if the sprite goes off screen @ it'll still be there when it comes back on screen. .macro copyobjectxytoperm localId:req - .byte 0x64 + .byte SCR_OP_COPYOBJECTXYTOPERM .2byte \localId .endm @ Sets the movement type (MOVEMENT_TYPE_*) for an object's template. .macro setobjectmovementtype localId:req, movementType:req - .byte 0x65 + .byte SCR_OP_SETOBJECTMOVEMENTTYPE .2byte \localId .byte \movementType .endm @@ -858,51 +861,51 @@ @ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the @ box and its text have been fully drawn. .macro waitmessage - .byte 0x66 + .byte SCR_OP_WAITMESSAGE .endm @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at @ that offset will be loaded and used. If text is NULL, then the value of script data 0 will be treated as @ a pointer to the text. The 'loadword 0' in msgbox sets this value, for instance. .macro message text:req - .byte 0x67 + .byte SCR_OP_MESSAGE .4byte \text .endm @ Closes the current message box. .macro closemessage - .byte 0x68 + .byte SCR_OP_CLOSEMESSAGE .endm @ Freezes all objects immediately except the player. The player is frozen once their movement is finished. .macro lockall - .byte 0x69 + .byte SCR_OP_LOCKALL .endm @ Freezes all objects immediately except the player and the selected object. The player and selected object are frozen once their movement is finished. .macro lock - .byte 0x6a + .byte SCR_OP_LOCK .endm @ Resumes normal movement for all objects on-screen, and closes any standard message boxes that are still open. .macro releaseall - .byte 0x6b + .byte SCR_OP_RELEASEALL .endm @ Resumes normal movement for the selected object (if there is one) and the player. Also closes any standard message boxes that are still open. .macro release - .byte 0x6c + .byte SCR_OP_RELEASE .endm @ Blocks script execution until the player presses the A or B button. .macro waitbuttonpress - .byte 0x6d + .byte SCR_OP_WAITBUTTONPRESS .endm @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. @ Their selection is stored in VAR_RESULT as NO (0) or YES (1). Pressing B is equivalent to answering NO .macro yesnobox x:req, y:req - .byte 0x6e + .byte SCR_OP_YESNOBOX .byte \x .byte \y .endm @@ -911,7 +914,7 @@ @ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. .macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req - .byte 0x6f + .byte SCR_OP_MULTICHOICE .byte \x .byte \y .byte \multichoiceId @@ -923,7 +926,7 @@ @ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. .macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req - .byte 0x70 + .byte SCR_OP_MULTICHOICEDEFAULT .byte \x .byte \y .byte \multichoiceId @@ -936,7 +939,7 @@ @ The per_row argument determines how many list items will be shown on a single row of the box. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. .macro multichoicegrid x:req, y:req, multichoiceId:req, per_row:req, ignoreBPress:req - .byte 0x71 + .byte SCR_OP_MULTICHOICEGRID .byte \x .byte \y .byte \multichoiceId @@ -946,12 +949,12 @@ @ Nopped in Emerald. .macro drawbox - .byte 0x72 + .byte SCR_OP_DRAWBOX .endm @ Nopped in Emerald, but still consumes parameters. .macro erasebox left:req, top:req, right:req, bottom:req - .byte 0x73 + .byte SCR_OP_ERASEBOX .byte \left .byte \top .byte \right @@ -960,7 +963,7 @@ @ Nopped in Emerald, but still consumes parameters. .macro drawboxtext left:req, top:req, multichoiceId:req, ignoreBPress:req - .byte 0x74 + .byte SCR_OP_DRAWBOXTEXT .byte \left .byte \top .byte \multichoiceId @@ -969,7 +972,7 @@ @ Displays a box containing the front sprite for the specified Pokemon species. .macro showmonpic species:req, x:req, y:req - .byte 0x75 + .byte SCR_OP_SHOWMONPIC .2byte \species .byte \x .byte \y @@ -977,12 +980,12 @@ @ Hides the box displayed by showmonpic. .macro hidemonpic - .byte 0x76 + .byte SCR_OP_HIDEMONPIC .endm @ Draws an image of the winner of the contest. winnerId is any CONTEST_WINNER_* constant. .macro showcontestpainting winnerId:req - .byte 0x77 + .byte SCR_OP_SHOWCONTESTPAINTING .byte \winnerId .endm @@ -990,7 +993,7 @@ @ to convert text to braille, and be preceded by brailleformat. The brailleformat data is skipped over (in RS, these @ bytes determined the box's size and position, but in Emerald these are calculated automatically). .macro braillemessage text:req - .byte 0x78 + .byte SCR_OP_BRAILLEMESSAGE .4byte \text .endm @@ -1132,7 +1135,7 @@ @ Gives the player an Egg of the specified species. @ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome. .macro giveegg species:req - .byte 0x7a + .byte SCR_OP_GIVEEGG .2byte \species .endm @@ -1140,7 +1143,7 @@ @ If a value greater than PARTY_SIZE is given for partyIndex it will use the last Pokémon in the party instead. @ Note that this means in vanilla a value equal to PARTY_SIZE for partyIndex will go out of bounds. .macro setmonmove partyIndex:req, slot:req, move:req - .byte 0x7b + .byte SCR_OP_SETMONMOVE .byte \partyIndex .byte \slot .2byte \move @@ -1150,7 +1153,7 @@ @ (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE. @ VAR_0x8004 is also set to this Pokemon's species. .macro checkpartymove move:req - .byte 0x7c + .byte SCR_OP_CHECKPARTYMOVE .2byte \move .endm @@ -1172,21 +1175,21 @@ @ Writes the name of the given Pokemon species to the specified buffer. .macro bufferspeciesname stringVarId:req, species:req - .byte 0x7d + .byte SCR_OP_BUFFERSPECIESNAME stringvar \stringVarId .2byte \species .endm @ Writes the name of the species of the first Pokemon in the player's party to the specified buffer. .macro bufferleadmonspeciesname stringVarId:req - .byte 0x7e + .byte SCR_OP_BUFFERLEADMONSPECIESNAME stringvar \stringVarId .endm @ Writes the nickname of the Pokemon in 'slot' (zero-indexed) of the player's party to the specified buffer. @ If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. .macro bufferpartymonnick stringVarId:req, slot:req - .byte 0x7f + .byte SCR_OP_BUFFERPARTYMONNICK stringvar \stringVarId .2byte \slot .endm @@ -1194,42 +1197,42 @@ @ Writes the name of the specified item to the specified buffer. If itemId is >= ITEMS_COUNT, @ then the name of ITEM_NONE ("????????") is buffered instead. .macro bufferitemname stringVarId:req, item:req - .byte 0x80 + .byte SCR_OP_BUFFERITEMNAME stringvar \stringVarId .2byte \item .endm @ Writes the name of the specified decoration to the specified buffer. .macro bufferdecorationname stringVarId:req, decoration:req - .byte 0x81 + .byte SCR_OP_BUFFERDECORATIONNAME stringvar \stringVarId .2byte \decoration .endm @ Writes the name of the specified move to the specified buffer. .macro buffermovename stringVarId:req, move:req - .byte 0x82 + .byte SCR_OP_BUFFERMOVENAME stringvar \stringVarId .2byte \move .endm @ Converts the value of input to a decimal string, and writes that string to the specified buffer. .macro buffernumberstring stringVarId:req, input:req - .byte 0x83 + .byte SCR_OP_BUFFERNUMBERSTRING stringvar \stringVarId .2byte \input .endm @ Writes the given standard string (STDSTRING_*) to the specified buffer. Invalid std string ids are not handled. .macro bufferstdstring stringVarId:req, index:req - .byte 0x84 + .byte SCR_OP_BUFFERSTDSTRING stringvar \stringVarId .2byte \index .endm @ Copies the string at the given pointer to the specified buffer. .macro bufferstring stringVarId:req, text:req - .byte 0x85 + .byte SCR_OP_BUFFERSTRING stringvar \stringVarId .4byte \text .endm @@ -1237,7 +1240,7 @@ @ Opens the Pokemart system, offering the specified products for sale. @ Products should be a list of .2byte item values preceded by an .align 2 .macro pokemart products:req - .byte 0x86 + .byte SCR_OP_POKEMART .4byte \products .endm @@ -1251,26 +1254,26 @@ @ Opens the Pokemart system and treats the list of items as decorations. @ Products should be a list of .2byte decoration values preceded by an .align 2 .macro pokemartdecoration products:req - .byte 0x87 + .byte SCR_OP_POKEMARTDECORATION .4byte \products .endm @ Identical to pokemartdecoration, but with slight changes to the clerk dialogue. See uses of MART_TYPE_DECOR2. .macro pokemartdecoration2 products:req - .byte 0x88 + .byte SCR_OP_POKEMARTDECORATION2 .4byte \products .endm @ Starts up the slot machine minigame. id is a SLOT_MACHINE_* value that influences probabilities of certain reel outcomes. .macro playslotmachine id:req - .byte 0x89 + .byte SCR_OP_PLAYSLOTMACHINE .2byte \id .endm @ Sets a berry tree's berry and growth stage. treeId is any BERRY_TREE_* constant (an index into berryTrees in SaveBlock1), @ berry is any ITEM_TO_BERRY(ITEM_BERRY_NAME) value, and growthStage is any BERRY_STAGE_* constant. .macro setberrytree treeId:req, berry:req, growthStage:req - .byte 0x8a + .byte SCR_OP_SETBERRYTREE .byte \treeId .byte \berry .byte \growthStage @@ -1278,34 +1281,34 @@ @ Opens the party menu to select a Pokemon for a contest. .macro choosecontestmon - .byte 0x8b + .byte SCR_OP_CHOOSECONTESTMON .endm @ Starts the appeals round of a contest. .macro startcontest - .byte 0x8c + .byte SCR_OP_STARTCONTEST .endm @ Shows the results screen of a contest. .macro showcontestresults - .byte 0x8d + .byte SCR_OP_SHOWCONTESTRESULTS .endm @ Starts communication to initialize a link contest. .macro contestlinktransfer - .byte 0x8e + .byte SCR_OP_CONTESTLINKTRANSFER .endm @ Stores a random integer between 0 and limit (exclusive of limit) in VAR_RESULT. .macro random limit:req - .byte 0x8f + .byte SCR_OP_RANDOM .2byte \limit .endm @ Adds value to the player's money. If adding 'value' money would exceed MAX_MONEY, the player's money is set to MAX_MONEY. @ If 'disable' is set to anything but 0 then this command does nothing. .macro addmoney value:req, disable=0 - .byte 0x90 + .byte SCR_OP_ADDMONEY .4byte \value .byte \disable .endm @@ -1313,7 +1316,7 @@ @ Subtracts value from the player's money. If the player has less than 'value' money, their money is set to 0. @ If 'disable' is set to anything but 0 then this command does nothing. .macro removemoney value:req, disable=0 - .byte 0x91 + .byte SCR_OP_REMOVEMONEY .4byte \value .byte \disable .endm @@ -1321,7 +1324,7 @@ @ Checks if the player has money >= value. VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not. @ If 'disable' is set to anything but 0 then this command does nothing. .macro checkmoney value:req, disable=0 - .byte 0x92 + .byte SCR_OP_CHECKMONEY .4byte \value .byte \disable .endm @@ -1329,7 +1332,7 @@ @ Creates a window showing how much money the player has. @ If 'disable' is set to anything but 0 then this command does nothing. .macro showmoneybox x:req, y:req, disable=0 - .byte 0x93 + .byte SCR_OP_SHOWMONEYBOX .byte \x .byte \y .byte \disable @@ -1337,7 +1340,7 @@ @ Destroys the window created by showmoneybox. Consumption of the x and y arguments was dummied out. .macro hidemoneybox - .byte 0x94 + .byte SCR_OP_HIDEMONEYBOX .byte 0 @ \x .byte 0 @ \y .endm @@ -1345,7 +1348,7 @@ @ Updates the window created by showmoneybox. Consumption of the x and y arguments was dummied out. @ If 'disable' is set to anything but 0 then this command does nothing. .macro updatemoneybox disable=0 - .byte 0x95 + .byte SCR_OP_UPDATEMONEYBOX .byte 0 @ \x .byte 0 @ \y .byte \disable @@ -1353,19 +1356,19 @@ @ Gets whether the effects of the specified PokeNews program are active. newsKind is a POKENEWS_* constant. .macro getpokenewsactive newsKind:req - .byte 0x96 + .byte SCR_OP_GETPOKENEWSACTIVE .2byte \newsKind .endm @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK) .macro fadescreen mode:req - .byte 0x97 + .byte SCR_OP_FADESCREEN .byte \mode .endm @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK) .macro fadescreenspeed mode:req, speed:req - .byte 0x98 + .byte SCR_OP_FADESCREENSPEED .byte \mode .byte \speed .endm @@ -1373,64 +1376,64 @@ @ Sets the flash level. A level of 0 is fully bright, a level of 1 is the largest flash radius, a level @ of 7 is the smallest flash radius, a level of 8 is fully black. .macro setflashlevel level:req - .byte 0x99 + .byte SCR_OP_SETFLASHLEVEL .2byte \level .endm @ Animates the flash radius from its current size to the size it would be at the specified level. @ Note that this does not actually change the current flash level. It's typically used just before a setflashlevel. .macro animateflash level:req - .byte 0x9a + .byte SCR_OP_ANIMATEFLASH .byte \level .endm @ Automatically scrolls through the message without player input and at a fixed speed. .macro messageautoscroll text:req - .byte 0x9b + .byte SCR_OP_MESSAGEAUTOSCROLL .4byte \text .endm @ Executes the specified field effect animation (FLDEFF_*). .macro dofieldeffect animation:req - .byte 0x9c + .byte SCR_OP_DOFIELDEFFECT .2byte \animation .endm @ Sets the field effect argument at index 'argNum' to 'value.' .macro setfieldeffectargument argNum:req, value:req - .byte 0x9d + .byte SCR_OP_SETFIELDEFFECTARGUMENT .byte \argNum .2byte \value .endm @ Blocks script execution until all playing field effect animations complete. .macro waitfieldeffect animation:req - .byte 0x9e + .byte SCR_OP_WAITFIELDEFFECT .2byte \animation .endm @ Sets which healing location (HEAL_LOCATION_*) the player will return to if all of the Pokemon in their party faint. .macro setrespawn heallocation:req - .byte 0x9f + .byte SCR_OP_SETRESPAWN .2byte \heallocation .endm @ Checks the player's gender. Stores the result (MALE (0) or FEMALE (1)) in VAR_RESULT. .macro checkplayergender - .byte 0xa0 + .byte SCR_OP_CHECKPLAYERGENDER .endm @ Plays the cry of the given species. Mode is any CRY_MODE_* constant. @ You can use waitmoncry to block script execution until the cry finishes. .macro playmoncry species:req, mode:req - .byte 0xa1 + .byte SCR_OP_PLAYMONCRY .2byte \species .2byte \mode .endm @ Set the metatile at (x, y) on the current map to the given metatile and impassability. .macro setmetatile x:req, y:req, metatileId:req, impassable:req - .byte 0xa2 + .byte SCR_OP_SETMETATILE .2byte \x .2byte \y .2byte \metatileId @@ -1439,37 +1442,37 @@ @ Queues a weather change to the default weather for the map. .macro resetweather - .byte 0xa3 + .byte SCR_OP_RESETWEATHER .endm @ Queues a weather change to type weather. .macro setweather type:req - .byte 0xa4 + .byte SCR_OP_SETWEATHER .2byte \type .endm @ Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather. .macro doweather - .byte 0xa5 + .byte SCR_OP_DOWEATHER .endm @ Enables the overworld task specified by stepCbId (STEP_CB_*). Only 1 can be active at a time. See src/field_tasks.c for more. .macro setstepcallback stepCbId:req - .byte 0xa6 + .byte SCR_OP_SETSTEPCALLBACK .byte \stepCbId .endm @ Sets the current map layout to the one specified by index (LAYOUT_*). @ This should be done before the layout is loaded, typically in the ON_TRANSITION map script. .macro setmaplayoutindex index:req - .byte 0xa7 + .byte SCR_OP_SETMAPLAYOUTINDEX .2byte \index .endm @ Sets the specified object's sprite's subpriority, and sets fixedPriority to TRUE. @ Only used to hide the player and Briney behind the boat. .macro setobjectsubpriority localId:req, map:req, subpriority:req - .byte 0xa8 + .byte SCR_OP_SETOBJECTSUBPRIORITY .2byte \localId map \map .byte \subpriority @@ -1477,7 +1480,7 @@ @ Sets the specified object's fixedPriority to FALSE. Does not change the subpriority field. .macro resetobjectsubpriority localId:req, map:req - .byte 0xa9 + .byte SCR_OP_RESETOBJECTSUBPRIORITY .2byte \localId map \map .endm @@ -1486,7 +1489,7 @@ @ the object event limit (e.g. Contest / Battle Dome audiences and Union Room group members). @ The specified id can be used to refer to the sprite again later with turnvobject. .macro createvobject graphicsId:req, id:req, x:req, y:req, elevation=3, direction=DIR_SOUTH - .byte 0xaa + .byte SCR_OP_CREATEVOBJECT .2byte \graphicsId .byte \id .2byte \x @@ -1497,47 +1500,47 @@ @ Turns a sprite created with createvobject. .macro turnvobject id:req, direction:req - .byte 0xab + .byte SCR_OP_TURNVOBJECT .byte \id .byte \direction .endm @ Opens the door metatile at (x, y) with an animation. .macro opendoor x:req, y:req - .byte 0xac + .byte SCR_OP_OPENDOOR .2byte \x .2byte \y .endm @ Closes the door metatile at (x, y) with an animation. .macro closedoor x:req, y:req - .byte 0xad + .byte SCR_OP_CLOSEDOOR .2byte \x .2byte \y .endm @ Waits for the door animation started with opendoor or closedoor to finish. .macro waitdooranim - .byte 0xae + .byte SCR_OP_WAITDOORANIM .endm @ Sets the door metatile at (x, y) to be open without an animation. .macro setdooropen x:req, y:req - .byte 0xaf + .byte SCR_OP_SETDOOROPEN .2byte \x .2byte \y .endm @ Sets the door metatile at (x, y) to be closed without an animation. .macro setdoorclosed x:req, y:req - .byte 0xb0 + .byte SCR_OP_SETDOORCLOSED .2byte \x .2byte \y .endm @ Consumes its parameters and does nothing. It is implemented but unused in Ruby/Sapphire. .macro addelevmenuitem a:req, b:req, c:req, d:req - .byte 0xb1 + .byte SCR_OP_ADDELEVMENUITEM .byte \a .2byte \b .2byte \c @@ -1546,19 +1549,19 @@ @ Does nothing. It is implemented but unused in Ruby/Sapphire. .macro showelevmenu - .byte 0xb2 + .byte SCR_OP_SHOWELEVMENU .endm @ Gets the number of coins the player has and stores it in the variable 'out'. .macro checkcoins out:req - .byte 0xb3 + .byte SCR_OP_CHECKCOINS .2byte \out .endm @ Gives 'count' coins to the player, up to a total of MAX_COINS. @ If the player already has MAX_COINS then VAR_RESULT is set to TRUE, otherwise it is set to FALSE. .macro addcoins count:req - .byte 0xb4 + .byte SCR_OP_ADDCOINS .2byte \count .endm @@ -1566,7 +1569,7 @@ @ If the player has fewer than 'count' coins then no coins are taken and VAR_RESULT is set to TRUE. @ Otherwise VAR_RESULT is set to FALSE. .macro removecoins count:req - .byte 0xb5 + .byte SCR_OP_REMOVECOINS .2byte \count .endm @@ -1576,7 +1579,7 @@ @ Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. @ If the player only has one Pokemon, a scripted double battle will be buggy. .macro setwildbattle species:req, level:req, item=ITEM_NONE, species2=SPECIES_NONE, level2=0, item2=ITEM_NONE - .byte 0xb6 + .byte SCR_OP_SETWILDBATTLE .2byte \species .byte \level .2byte \item @@ -1587,84 +1590,84 @@ @ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes. .macro dowildbattle - .byte 0xb7 + .byte SCR_OP_DOWILDBATTLE .endm @ Sets a relative address to be used by the other vcommands as part of a Mystery Gift script. .macro setvaddress pointer:req - .byte 0xb8 + .byte SCR_OP_SETVADDRESS .4byte \pointer .endm @ Equivalent to goto using the relative address set by setvaddress. .macro vgoto destination:req - .byte 0xb9 + .byte SCR_OP_VGOTO .4byte \destination .endm @ Equivalent to call using the relative address set by setvaddress. .macro vcall destination:req - .byte 0xba + .byte SCR_OP_VCALL .4byte \destination .endm @ Equivalent to goto_if using the relative address set by setvaddress. .macro vgoto_if condition:req, destination:req - .byte 0xbb + .byte SCR_OP_VGOTO_IF .byte \condition .4byte \destination .endm @ Equivalent to call_if using the relative address set by setvaddress. .macro vcall_if condition:req, destination:req - .byte 0xbc + .byte SCR_OP_VCALL_IF .byte \condition .4byte \destination .endm @ Equivalent to message using the relative address set by setvaddress. .macro vmessage text:req - .byte 0xbd + .byte SCR_OP_VMESSAGE .4byte \text .endm @ Expands the given text at the pointer (- the relative address set by setvaddress) into gStringVar4 .macro vbuffermessage text:req - .byte 0xbe + .byte SCR_OP_VBUFFERMESSAGE .4byte \text .endm @ Equivalent to bufferstring using the relative address set by setvaddress. .macro vbufferstring stringVarIndex:req, text:req - .byte 0xbf + .byte SCR_OP_VBUFFERSTRING stringvar \stringVarIndex .4byte \text .endm @ Create a window showing how many Coins the player has. .macro showcoinsbox x:req, y:req - .byte 0xc0 + .byte SCR_OP_SHOWCOINSBOX .byte \x .byte \y .endm @ Destroys the window created by showcoins. It consumes its arguments but doesn't use them. .macro hidecoinsbox x:req, y:req - .byte 0xc1 + .byte SCR_OP_HIDECOINSBOX .byte \x .byte \y .endm @ Updates the window created by showcoins. It consumes its arguments but doesn't use them. .macro updatecoinsbox x:req, y:req - .byte 0xc2 + .byte SCR_OP_UPDATECOINSBOX .byte \x .byte \y .endm @ Increases the value of the specified game stat by 1. The maximum value of a stat is 0xFFFFFF. See include/constants/game_stat.h .macro incrementgamestat stat:req - .byte 0xc3 + .byte SCR_OP_INCREMENTGAMESTAT .byte \stat .endm @@ -1672,78 +1675,78 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setescapewarp map:req, a, b, c - .byte 0xc4 + .byte SCR_OP_SETESCAPEWARP formatwarp \map, \a, \b, \c .endm @ Blocks script execution until cry finishes. .macro waitmoncry - .byte 0xc5 + .byte SCR_OP_WAITMONCRY .endm @ Writes the name of the specified PC box to the specified buffer. .macro bufferboxname stringVarId:req, box:req - .byte 0xc6 + .byte SCR_OP_BUFFERBOXNAME stringvar \stringVarId .2byte \box .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro textcolor color:req - .byte 0xc7 + .byte SCR_OP_TEXTCOLOR .byte \color .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro loadhelp text:req - .byte 0xc8 + .byte SCR_OP_LOADHELP .4byte \text .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro unloadhelp - .byte 0xc9 + .byte SCR_OP_UNLOADHELP .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro signmsg - .byte 0xca + .byte SCR_OP_SIGNMSG .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro normalmsg - .byte 0xcb + .byte SCR_OP_NORMALMSG .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro comparehiddenvar a:req, value:req - .byte 0xcc + .byte SCR_OP_COMPAREHIDDENVAR .byte \a .4byte \value .endm @ Sets the modernFatefulEncounter bit for the Pokemon in the specified slot of the player's party. .macro setmodernfatefulencounter slot:req - .byte 0xcd + .byte SCR_OP_SETMODERNFATEFULENCOUNTER .2byte \slot .endm @ Checks if the modernFatefulEncounter bit is set for the Pokemon in the specified slot of the player's party. If it isn't set, @ VAR_RESULT is TRUE. If the bit is set (or if the specified slot is empty or invalid), VAR_RESULT is FALSE. .macro checkmodernfatefulencounter slot:req - .byte 0xce + .byte SCR_OP_CHECKMODERNFATEFULENCOUNTER .2byte \slot .endm @ Jumps to the ram script saved from a Wonder Card. If there is no valid saved Wonder Card or if the @ ram script is invalid then this does nothing. .macro trywondercardscript - .byte 0xcf + .byte SCR_OP_TRYWONDERCARDSCRIPT .endm @ Used only in FireRed/LeafGreen, does nothing in Emerald. .macro setworldmapflag worldmapflag:req - .byte 0xd0 + .byte SCR_OP_SETWORLDMAPFLAG .2byte \worldmapflag .endm @@ -1752,13 +1755,13 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpspinenter map:req, a, b, c - .byte 0xd1 + .byte SCR_OP_WARPSPINENTER formatwarp \map, \a, \b, \c .endm @ Changes the location where the player caught the Pokemon in the specified slot of their party. .macro setmonmetlocation slot:req, location:req - .byte 0xd2 + .byte SCR_OP_SETMONMETLOCATION .2byte \slot .byte \location .endm @@ -1766,26 +1769,26 @@ @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Moves the objects one rotation @ on the colored puzzle specified by puzzleNumber. .macro moverotatingtileobjects puzzleNumber:req - .byte 0xd3 + .byte SCR_OP_MOVEROTATINGTILEOBJECTS .2byte \puzzleNumber .endm @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Updates the facing direction of all objects on the puzzle tiles .macro turnrotatingtileobjects - .byte 0xd4 + .byte SCR_OP_TURNROTATINGTILEOBJECTS .endm @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Allocates memory for the puzzle objects. @ isTrickHouse is needed to determine which of the two maps the puzzle is on, in order to know where in the tileset @ the puzzle tiles start (TRUE for Trick House Room, FALSE for Mossdeep Gym). .macro initrotatingtilepuzzle isTrickHouse:req - .byte 0xd5 + .byte SCR_OP_INITROTATINGTILEPUZZLE .2byte \isTrickHouse .endm @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Frees the memory allocated for the puzzle objects. .macro freerotatingtilepuzzle - .byte 0xd6 + .byte SCR_OP_FREEROTATINGTILEPUZZLE .endm @ Warp used by the teleport tiles in the Mossdeep Gym. Plays SE_WARP_IN and does a simple fade transition. @@ -1793,30 +1796,30 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpmossdeepgym map:req, a, b, c - .byte 0xd7 + .byte SCR_OP_WARPMOSSDEEPGYM formatwarp \map, \a, \b, \c .endm @ Sets the selected object to the id of the currently approaching trainer. .macro selectapproachingtrainer - .byte 0xd8 + .byte SCR_OP_SELECTAPPROACHINGTRAINER .endm @ Freezes all objects immediately except the player and the approaching trainers. @ The player and trainers are frozen once their movement is finished. .macro lockfortrainer - .byte 0xd9 + .byte SCR_OP_LOCKFORTRAINER .endm @ Destroys the window created by braillemessage. .macro closebraillemessage - .byte 0xda + .byte SCR_OP_CLOSEBRAILLEMESSAGE .endm @ Prints and draws the message all at once rather than character by character. @ Does not wait for player input to continue. .macro messageinstant text:req - .byte 0xdb + .byte SCR_OP_MESSAGEINSTANT .4byte \text .endm @@ -1824,7 +1827,7 @@ @ and the reverse on the fade in, in effect saving gPlttBufferUnfaded to restore it. @ If nowait set, does not wait for the fade to complete .macro fadescreenswapbuffers mode:req, nowait=0 - .byte 0xdc + .byte SCR_OP_FADESCREENSWAPBUFFERS .byte \mode .byte \nowait .endm @@ -1832,7 +1835,7 @@ @ Buffers the specified trainer's class name to the given string var. @ If the trainer id is >= TRAINERS_COUNT it will be treated as TRAINER_NONE. .macro buffertrainerclassname stringVarId:req, trainerId:req - .byte 0xdd + .byte SCR_OP_BUFFERTRAINERCLASSNAME stringvar \stringVarId .2byte \trainerId .endm @@ -1840,14 +1843,14 @@ @ Buffers the specified trainer's name to the given string var. @ If the trainer id is >= TRAINERS_COUNT it will be treated as TRAINER_NONE. .macro buffertrainername stringVarId:req, trainerId:req - .byte 0xde + .byte SCR_OP_BUFFERTRAINERNAME stringvar \stringVarId .2byte \trainerId .endm @ Starts a Pokenav call with the given text. .macro pokenavcall text:req - .byte 0xdf + .byte SCR_OP_POKENAVCALL .4byte \text .endm @@ -1855,14 +1858,14 @@ @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro warpwhitefade map:req, a, b, c - .byte 0xe0 + .byte SCR_OP_WARPWHITEFADE formatwarp \map, \a, \b, \c .endm @ Buffers the name of the contest category to the buffer. @ For example a category of CONTEST_CATEGORY_COOL will buffer the string "COOLNESS CONTEST". .macro buffercontestname stringVarId:req, category:req - .byte 0xe1 + .byte SCR_OP_BUFFERCONTESTNAME stringvar \stringVarId .2byte \category .endm @@ -1871,14 +1874,14 @@ @ and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). @ If the specified item is >= ITEMS_COUNT then the name of ITEM_NONE ("????????") is buffered instead. .macro bufferitemnameplural stringVarId:req, item:req, quantity:req - .byte 0xe2 + .byte SCR_OP_BUFFERITEMNAMEPLURAL stringvar \stringVarId .2byte \item .2byte \quantity .endm .macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg - .byte 0xe3 + .byte SCR_OP_DYNMULTICHOICE .2byte \left .2byte \top .byte \ignoreBPress @@ -1900,7 +1903,7 @@ .endm .macro dynmultipush name:req, id:req - .byte 0xe4 + .byte SCR_OP_DYNMULTIPUSH .4byte \name .2byte \id .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 42cef5cc7d..5f9d79dff0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -785,7 +785,7 @@ BattleScript_EffectFlingConsumeBerry: restorebattleritem BS_TARGET BattleScript_FlingEnd: tryfaintmon BS_TARGET - trysymbiosis + trysymbiosis BS_ATTACKER goto BattleScript_MoveEnd BattleScript_FlingFailConsumeItem:: @@ -1246,8 +1246,8 @@ BattleScript_MoveEffectBugBite:: consumeberry BS_ATTACKER, FALSE bicword gHitMarker, HITMARKER_DISABLE_ANIMATION setbyte sBERRY_OVERRIDE, 0 - trysymbiosis restoretarget + trysymbiosis BS_TARGET return BattleScript_MoveEffectCoreEnforcer:: @@ -1576,7 +1576,7 @@ BattleScript_EffectBestow:: waitanimation printstring STRINGID_BESTOWITEMGIVING waitmessage B_WAIT_TIME_LONG - trysymbiosis + trysymbiosis BS_ATTACKER goto BattleScript_MoveEnd BattleScript_EffectAfterYou:: diff --git a/data/event_scripts.s b/data/event_scripts.s index 7c04c90831..a61d696acc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -64,6 +64,7 @@ .section script_data, "aw", %progbits + .set ALLOCATE_SCRIPT_CMD_TABLE, 1 .include "data/script_cmd_table.inc" gSpecialVars:: diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 61046e6cb4..457ff8f670 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -1,245 +1,258 @@ @ 'requests_effects' should be set to 1 if the command contains a call @ to 'Script_RequestEffects', which allows it to be analyzed with @ 'RunScriptImmediatelyUntilEffect'. -.macro cmd func:req, requests_effects=0 + .ifndef SCRIPT_CMD_TABLE_ENTRY_MACRO + .set SCRIPT_CMD_TABLE_ENTRY_MACRO, 1 + .macro script_cmd_table_entry constant:req value:req, requests_effects=0 + .if ALLOCATE_SCRIPT_CMD_TABLE .if \requests_effects == 0 - .4byte \func + .4byte \value .else - .4byte \func + ROM_SIZE + .4byte \value + ROM_SIZE + .endif + .else + enum \constant + .endif + .endm .endif -.endm + + enum_start + .if ALLOCATE_SCRIPT_CMD_TABLE .align 2 gScriptCmdTable:: - cmd ScrCmd_nop, requests_effects=1 @ 0x00 - cmd ScrCmd_nop1, requests_effects=1 @ 0x01 - cmd ScrCmd_end, requests_effects=1 @ 0x02 - cmd ScrCmd_return, requests_effects=1 @ 0x03 - cmd ScrCmd_call, requests_effects=1 @ 0x04 - cmd ScrCmd_goto, requests_effects=1 @ 0x05 - cmd ScrCmd_goto_if, requests_effects=1 @ 0x06 - cmd ScrCmd_call_if, requests_effects=1 @ 0x07 - cmd ScrCmd_gotostd, requests_effects=1 @ 0x08 - cmd ScrCmd_callstd, requests_effects=1 @ 0x09 - cmd ScrCmd_gotostd_if, requests_effects=1 @ 0x0a - cmd ScrCmd_callstd_if, requests_effects=1 @ 0x0b - cmd ScrCmd_returnram, requests_effects=1 @ 0x0c - cmd ScrCmd_endram, requests_effects=1 @ 0x0d - cmd ScrCmd_setmysteryeventstatus, requests_effects=1 @ 0x0e - cmd ScrCmd_loadword, requests_effects=1 @ 0x0f - cmd ScrCmd_loadbyte, requests_effects=1 @ 0x10 - cmd ScrCmd_setptr, requests_effects=1 @ 0x11 - cmd ScrCmd_loadbytefromptr, requests_effects=1 @ 0x12 - cmd ScrCmd_setptrbyte, requests_effects=1 @ 0x13 - cmd ScrCmd_copylocal, requests_effects=1 @ 0x14 - cmd ScrCmd_copybyte, requests_effects=1 @ 0x15 - cmd ScrCmd_setvar, requests_effects=1 @ 0x16 - cmd ScrCmd_addvar, requests_effects=1 @ 0x17 - cmd ScrCmd_subvar, requests_effects=1 @ 0x18 - cmd ScrCmd_copyvar, requests_effects=1 @ 0x19 - cmd ScrCmd_setorcopyvar, requests_effects=1 @ 0x1a - cmd ScrCmd_compare_local_to_local, requests_effects=1 @ 0x1b - cmd ScrCmd_compare_local_to_value, requests_effects=1 @ 0x1c - cmd ScrCmd_compare_local_to_ptr, requests_effects=1 @ 0x1d - cmd ScrCmd_compare_ptr_to_local, requests_effects=1 @ 0x1e - cmd ScrCmd_compare_ptr_to_value, requests_effects=1 @ 0x1f - cmd ScrCmd_compare_ptr_to_ptr, requests_effects=1 @ 0x20 - cmd ScrCmd_compare_var_to_value, requests_effects=1 @ 0x21 - cmd ScrCmd_compare_var_to_var, requests_effects=1 @ 0x22 - cmd ScrCmd_callnative, requests_effects=1 @ 0x23 - cmd ScrCmd_gotonative, requests_effects=1 @ 0x24 - cmd ScrCmd_special, requests_effects=1 @ 0x25 - cmd ScrCmd_specialvar, requests_effects=1 @ 0x26 - cmd ScrCmd_waitstate, requests_effects=1 @ 0x27 - cmd ScrCmd_delay, requests_effects=1 @ 0x28 - cmd ScrCmd_setflag, requests_effects=1 @ 0x29 - cmd ScrCmd_clearflag, requests_effects=1 @ 0x2a - cmd ScrCmd_checkflag, requests_effects=1 @ 0x2b - cmd ScrCmd_initclock, requests_effects=1 @ 0x2c - cmd ScrCmd_dotimebasedevents, requests_effects=1 @ 0x2d - cmd ScrCmd_gettime, requests_effects=1 @ 0x2e - cmd ScrCmd_playse, requests_effects=1 @ 0x2f - cmd ScrCmd_waitse, requests_effects=1 @ 0x30 - cmd ScrCmd_playfanfare, requests_effects=1 @ 0x31 - cmd ScrCmd_waitfanfare, requests_effects=1 @ 0x32 - cmd ScrCmd_playbgm, requests_effects=1 @ 0x33 - cmd ScrCmd_savebgm, requests_effects=1 @ 0x34 - cmd ScrCmd_fadedefaultbgm, requests_effects=1 @ 0x35 - cmd ScrCmd_fadenewbgm, requests_effects=1 @ 0x36 - cmd ScrCmd_fadeoutbgm, requests_effects=1 @ 0x37 - cmd ScrCmd_fadeinbgm, requests_effects=1 @ 0x38 - cmd ScrCmd_warp, requests_effects=1 @ 0x39 - cmd ScrCmd_warpsilent, requests_effects=1 @ 0x3a - cmd ScrCmd_warpdoor, requests_effects=1 @ 0x3b - cmd ScrCmd_warphole, requests_effects=1 @ 0x3c - cmd ScrCmd_warpteleport, requests_effects=1 @ 0x3d - cmd ScrCmd_setwarp, requests_effects=1 @ 0x3e - cmd ScrCmd_setdynamicwarp, requests_effects=1 @ 0x3f - cmd ScrCmd_setdivewarp, requests_effects=1 @ 0x40 - cmd ScrCmd_setholewarp, requests_effects=1 @ 0x41 - cmd ScrCmd_getplayerxy, requests_effects=1 @ 0x42 - cmd ScrCmd_getpartysize, requests_effects=1 @ 0x43 - cmd ScrCmd_additem, requests_effects=1 @ 0x44 - cmd ScrCmd_removeitem, requests_effects=1 @ 0x45 - cmd ScrCmd_checkitemspace, requests_effects=1 @ 0x46 - cmd ScrCmd_checkitem, requests_effects=1 @ 0x47 - cmd ScrCmd_checkitemtype, requests_effects=1 @ 0x48 - cmd ScrCmd_addpcitem, requests_effects=1 @ 0x49 - cmd ScrCmd_checkpcitem, requests_effects=1 @ 0x4a - cmd ScrCmd_adddecoration, requests_effects=1 @ 0x4b - cmd ScrCmd_removedecoration, requests_effects=1 @ 0x4c - cmd ScrCmd_checkdecor, requests_effects=1 @ 0x4d - cmd ScrCmd_checkdecorspace, requests_effects=1 @ 0x4e - cmd ScrCmd_applymovement, requests_effects=1 @ 0x4f - cmd ScrCmd_applymovementat, requests_effects=1 @ 0x50 - cmd ScrCmd_waitmovement, requests_effects=1 @ 0x51 - cmd ScrCmd_waitmovementat, requests_effects=1 @ 0x52 - cmd ScrCmd_removeobject, requests_effects=1 @ 0x53 - cmd ScrCmd_removeobjectat, requests_effects=1 @ 0x54 - cmd ScrCmd_addobject, requests_effects=1 @ 0x55 - cmd ScrCmd_addobjectat, requests_effects=1 @ 0x56 - cmd ScrCmd_setobjectxy, requests_effects=1 @ 0x57 - cmd ScrCmd_showobjectat, requests_effects=1 @ 0x58 - cmd ScrCmd_hideobjectat, requests_effects=1 @ 0x59 - cmd ScrCmd_faceplayer, requests_effects=1 @ 0x5a - cmd ScrCmd_turnobject, requests_effects=1 @ 0x5b - cmd ScrCmd_trainerbattle, requests_effects=1 @ 0x5c - cmd ScrCmd_dotrainerbattle, requests_effects=1 @ 0x5d - cmd ScrCmd_gotopostbattlescript, requests_effects=1 @ 0x5e - cmd ScrCmd_gotobeatenscript, requests_effects=1 @ 0x5f - cmd ScrCmd_checktrainerflag, requests_effects=1 @ 0x60 - cmd ScrCmd_settrainerflag, requests_effects=1 @ 0x61 - cmd ScrCmd_cleartrainerflag, requests_effects=1 @ 0x62 - cmd ScrCmd_setobjectxyperm, requests_effects=1 @ 0x63 - cmd ScrCmd_copyobjectxytoperm, requests_effects=1 @ 0x64 - cmd ScrCmd_setobjectmovementtype, requests_effects=1 @ 0x65 - cmd ScrCmd_waitmessage, requests_effects=1 @ 0x66 - cmd ScrCmd_message, requests_effects=1 @ 0x67 - cmd ScrCmd_closemessage, requests_effects=1 @ 0x68 - cmd ScrCmd_lockall, requests_effects=1 @ 0x69 - cmd ScrCmd_lock, requests_effects=1 @ 0x6a - cmd ScrCmd_releaseall, requests_effects=1 @ 0x6b - cmd ScrCmd_release, requests_effects=1 @ 0x6c - cmd ScrCmd_waitbuttonpress, requests_effects=1 @ 0x6d - cmd ScrCmd_yesnobox, requests_effects=1 @ 0x6e - cmd ScrCmd_multichoice, requests_effects=1 @ 0x6f - cmd ScrCmd_multichoicedefault, requests_effects=1 @ 0x70 - cmd ScrCmd_multichoicegrid, requests_effects=1 @ 0x71 - cmd ScrCmd_drawbox, requests_effects=1 @ 0x72 - cmd ScrCmd_erasebox, requests_effects=1 @ 0x73 - cmd ScrCmd_drawboxtext, requests_effects=1 @ 0x74 - cmd ScrCmd_showmonpic, requests_effects=1 @ 0x75 - cmd ScrCmd_hidemonpic, requests_effects=1 @ 0x76 - cmd ScrCmd_showcontestpainting, requests_effects=1 @ 0x77 - cmd ScrCmd_braillemessage, requests_effects=1 @ 0x78 - cmd ScrCmd_nop1, requests_effects=1 @ 0x79 - cmd ScrCmd_giveegg, requests_effects=1 @ 0x7a - cmd ScrCmd_setmonmove, requests_effects=1 @ 0x7b - cmd ScrCmd_checkpartymove, requests_effects=1 @ 0x7c - cmd ScrCmd_bufferspeciesname, requests_effects=1 @ 0x7d - cmd ScrCmd_bufferleadmonspeciesname, requests_effects=1 @ 0x7e - cmd ScrCmd_bufferpartymonnick, requests_effects=1 @ 0x7f - cmd ScrCmd_bufferitemname, requests_effects=1 @ 0x80 - cmd ScrCmd_bufferdecorationname, requests_effects=1 @ 0x81 - cmd ScrCmd_buffermovename, requests_effects=1 @ 0x82 - cmd ScrCmd_buffernumberstring, requests_effects=1 @ 0x83 - cmd ScrCmd_bufferstdstring, requests_effects=1 @ 0x84 - cmd ScrCmd_bufferstring, requests_effects=1 @ 0x85 - cmd ScrCmd_pokemart, requests_effects=1 @ 0x86 - cmd ScrCmd_pokemartdecoration, requests_effects=1 @ 0x87 - cmd ScrCmd_pokemartdecoration2, requests_effects=1 @ 0x88 - cmd ScrCmd_playslotmachine, requests_effects=1 @ 0x89 - cmd ScrCmd_setberrytree, requests_effects=1 @ 0x8a - cmd ScrCmd_choosecontestmon, requests_effects=1 @ 0x8b - cmd ScrCmd_startcontest, requests_effects=1 @ 0x8c - cmd ScrCmd_showcontestresults, requests_effects=1 @ 0x8d - cmd ScrCmd_contestlinktransfer, requests_effects=1 @ 0x8e - cmd ScrCmd_random, requests_effects=1 @ 0x8f - cmd ScrCmd_addmoney, requests_effects=1 @ 0x90 - cmd ScrCmd_removemoney, requests_effects=1 @ 0x91 - cmd ScrCmd_checkmoney, requests_effects=1 @ 0x92 - cmd ScrCmd_showmoneybox, requests_effects=1 @ 0x93 - cmd ScrCmd_hidemoneybox, requests_effects=1 @ 0x94 - cmd ScrCmd_updatemoneybox, requests_effects=1 @ 0x95 - cmd ScrCmd_getpokenewsactive, requests_effects=1 @ 0x96 - cmd ScrCmd_fadescreen, requests_effects=1 @ 0x97 - cmd ScrCmd_fadescreenspeed, requests_effects=1 @ 0x98 - cmd ScrCmd_setflashlevel, requests_effects=1 @ 0x99 - cmd ScrCmd_animateflash, requests_effects=1 @ 0x9a - cmd ScrCmd_messageautoscroll, requests_effects=1 @ 0x9b - cmd ScrCmd_dofieldeffect, requests_effects=1 @ 0x9c - cmd ScrCmd_setfieldeffectargument, requests_effects=1 @ 0x9d - cmd ScrCmd_waitfieldeffect, requests_effects=1 @ 0x9e - cmd ScrCmd_setrespawn, requests_effects=1 @ 0x9f - cmd ScrCmd_checkplayergender, requests_effects=1 @ 0xa0 - cmd ScrCmd_playmoncry, requests_effects=1 @ 0xa1 - cmd ScrCmd_setmetatile, requests_effects=1 @ 0xa2 - cmd ScrCmd_resetweather, requests_effects=1 @ 0xa3 - cmd ScrCmd_setweather, requests_effects=1 @ 0xa4 - cmd ScrCmd_doweather, requests_effects=1 @ 0xa5 - cmd ScrCmd_setstepcallback, requests_effects=1 @ 0xa6 - cmd ScrCmd_setmaplayoutindex, requests_effects=1 @ 0xa7 - cmd ScrCmd_setobjectsubpriority, requests_effects=1 @ 0xa8 - cmd ScrCmd_resetobjectsubpriority, requests_effects=1 @ 0xa9 - cmd ScrCmd_createvobject, requests_effects=1 @ 0xaa - cmd ScrCmd_turnvobject, requests_effects=1 @ 0xab - cmd ScrCmd_opendoor, requests_effects=1 @ 0xac - cmd ScrCmd_closedoor, requests_effects=1 @ 0xad - cmd ScrCmd_waitdooranim, requests_effects=1 @ 0xae - cmd ScrCmd_setdooropen, requests_effects=1 @ 0xaf - cmd ScrCmd_setdoorclosed, requests_effects=1 @ 0xb0 - cmd ScrCmd_addelevmenuitem, requests_effects=1 @ 0xb1 - cmd ScrCmd_showelevmenu, requests_effects=1 @ 0xb2 - cmd ScrCmd_checkcoins, requests_effects=1 @ 0xb3 - cmd ScrCmd_addcoins, requests_effects=1 @ 0xb4 - cmd ScrCmd_removecoins, requests_effects=1 @ 0xb5 - cmd ScrCmd_setwildbattle, requests_effects=1 @ 0xb6 - cmd ScrCmd_dowildbattle, requests_effects=1 @ 0xb7 - cmd ScrCmd_setvaddress, requests_effects=1 @ 0xb8 - cmd ScrCmd_vgoto, requests_effects=1 @ 0xb9 - cmd ScrCmd_vcall, requests_effects=1 @ 0xba - cmd ScrCmd_vgoto_if, requests_effects=1 @ 0xbb - cmd ScrCmd_vcall_if, requests_effects=1 @ 0xbc - cmd ScrCmd_vmessage, requests_effects=1 @ 0xbd - cmd ScrCmd_vbuffermessage, requests_effects=1 @ 0xbe - cmd ScrCmd_vbufferstring, requests_effects=1 @ 0xbf - cmd ScrCmd_showcoinsbox, requests_effects=1 @ 0xc0 - cmd ScrCmd_hidecoinsbox, requests_effects=1 @ 0xc1 - cmd ScrCmd_updatecoinsbox, requests_effects=1 @ 0xc2 - cmd ScrCmd_incrementgamestat, requests_effects=1 @ 0xc3 - cmd ScrCmd_setescapewarp, requests_effects=1 @ 0xc4 - cmd ScrCmd_waitmoncry, requests_effects=1 @ 0xc5 - cmd ScrCmd_bufferboxname, requests_effects=1 @ 0xc6 - cmd ScrCmd_nop1, requests_effects=1 @ 0xc7 - cmd ScrCmd_nop1, requests_effects=1 @ 0xc8 - cmd ScrCmd_nop1, requests_effects=1 @ 0xc9 - cmd ScrCmd_nop1, requests_effects=1 @ 0xca - cmd ScrCmd_nop1, requests_effects=1 @ 0xcb - cmd ScrCmd_nop1, requests_effects=1 @ 0xcc - cmd ScrCmd_setmodernfatefulencounter, requests_effects=1 @ 0xcd - cmd ScrCmd_checkmodernfatefulencounter, requests_effects=1 @ 0xce - cmd ScrCmd_trywondercardscript, requests_effects=1 @ 0xcf - cmd ScrCmd_nop1, requests_effects=1 @ 0xd0 - cmd ScrCmd_warpspinenter, requests_effects=1 @ 0xd1 - cmd ScrCmd_setmonmetlocation, requests_effects=1 @ 0xd2 - cmd ScrCmd_moverotatingtileobjects, requests_effects=1 @ 0xd3 - cmd ScrCmd_turnrotatingtileobjects, requests_effects=1 @ 0xd4 - cmd ScrCmd_initrotatingtilepuzzle, requests_effects=1 @ 0xd5 - cmd ScrCmd_freerotatingtilepuzzle, requests_effects=1 @ 0xd6 - cmd ScrCmd_warpmossdeepgym, requests_effects=1 @ 0xd7 - cmd ScrCmd_selectapproachingtrainer, requests_effects=1 @ 0xd8 - cmd ScrCmd_lockfortrainer, requests_effects=1 @ 0xd9 - cmd ScrCmd_closebraillemessage, requests_effects=1 @ 0xda - cmd ScrCmd_messageinstant, requests_effects=1 @ 0xdb - cmd ScrCmd_fadescreenswapbuffers, requests_effects=1 @ 0xdc - cmd ScrCmd_buffertrainerclassname, requests_effects=1 @ 0xdd - cmd ScrCmd_buffertrainername, requests_effects=1 @ 0xde - cmd ScrCmd_pokenavcall, requests_effects=1 @ 0xdf - cmd ScrCmd_warpwhitefade, requests_effects=1 @ 0xe0 - cmd ScrCmd_buffercontestname, requests_effects=1 @ 0xe1 - cmd ScrCmd_bufferitemnameplural, requests_effects=1 @ 0xe2 - cmd ScrCmd_dynmultichoice, requests_effects=1 @ 0xe3 - cmd ScrCmd_dynmultipush, requests_effects=1 @ 0xe4 + .endif + script_cmd_table_entry SCR_OP_NOP ScrCmd_nop, requests_effects=1 @ 0x00 + script_cmd_table_entry SCR_OP_NOP1 ScrCmd_nop1, requests_effects=1 @ 0x01 + script_cmd_table_entry SCR_OP_END ScrCmd_end, requests_effects=1 @ 0x02 + script_cmd_table_entry SCR_OP_RETURN ScrCmd_return, requests_effects=1 @ 0x03 + script_cmd_table_entry SCR_OP_CALL ScrCmd_call, requests_effects=1 @ 0x04 + script_cmd_table_entry SCR_OP_GOTO ScrCmd_goto, requests_effects=1 @ 0x05 + script_cmd_table_entry SCR_OP_GOTO_IF ScrCmd_goto_if, requests_effects=1 @ 0x06 + script_cmd_table_entry SCR_OP_CALL_IF ScrCmd_call_if, requests_effects=1 @ 0x07 + script_cmd_table_entry SCR_OP_GOTO_STD ScrCmd_gotostd, requests_effects=1 @ 0x08 + script_cmd_table_entry SCR_OP_CALL_STD ScrCmd_callstd, requests_effects=1 @ 0x09 + script_cmd_table_entry SCR_OP_GOTO_STD_IF ScrCmd_gotostd_if, requests_effects=1 @ 0x0a + script_cmd_table_entry SCR_OP_CALL_STD_IF ScrCmd_callstd_if, requests_effects=1 @ 0x0b + script_cmd_table_entry SCR_OP_RETURNRAM ScrCmd_returnram, requests_effects=1 @ 0x0c + script_cmd_table_entry SCR_OP_ENDRAM ScrCmd_endram, requests_effects=1 @ 0x0d + script_cmd_table_entry SCR_OP_SETMYSTERYEVENTSTATUS ScrCmd_setmysteryeventstatus, requests_effects=1 @ 0x0e + script_cmd_table_entry SCR_OP_LOAD_WORD ScrCmd_loadword, requests_effects=1 @ 0x0f + script_cmd_table_entry SCR_OP_LOAD_BYTE ScrCmd_loadbyte, requests_effects=1 @ 0x10 + script_cmd_table_entry SCR_OP_SETPTR ScrCmd_setptr, requests_effects=1 @ 0x11 + script_cmd_table_entry SCR_OP_LOADBYTEFROMPTR ScrCmd_loadbytefromptr, requests_effects=1 @ 0x12 + script_cmd_table_entry SCR_OP_SETPTRBYTE ScrCmd_setptrbyte, requests_effects=1 @ 0x13 + script_cmd_table_entry SCR_OP_COPYLOCAL ScrCmd_copylocal, requests_effects=1 @ 0x14 + script_cmd_table_entry SCR_OP_COPYBYTE ScrCmd_copybyte, requests_effects=1 @ 0x15 + script_cmd_table_entry SCR_OP_SETVAR ScrCmd_setvar, requests_effects=1 @ 0x16 + script_cmd_table_entry SCR_OP_ADDVAR ScrCmd_addvar, requests_effects=1 @ 0x17 + script_cmd_table_entry SCR_OP_SUBVAR ScrCmd_subvar, requests_effects=1 @ 0x18 + script_cmd_table_entry SCR_OP_COPYVAR ScrCmd_copyvar, requests_effects=1 @ 0x19 + script_cmd_table_entry SCR_OP_SETORCOPYVAR ScrCmd_setorcopyvar, requests_effects=1 @ 0x1a + script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_LOCAL ScrCmd_compare_local_to_local, requests_effects=1 @ 0x1b + script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_VALUE ScrCmd_compare_local_to_value, requests_effects=1 @ 0x1c + script_cmd_table_entry SCR_OP_COMPARE_LOCAL_TO_PTR ScrCmd_compare_local_to_ptr, requests_effects=1 @ 0x1d + script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_LOCAL ScrCmd_compare_ptr_to_local, requests_effects=1 @ 0x1e + script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_VALUE ScrCmd_compare_ptr_to_value, requests_effects=1 @ 0x1f + script_cmd_table_entry SCR_OP_COMPARE_PTR_TO_PTR ScrCmd_compare_ptr_to_ptr, requests_effects=1 @ 0x20 + script_cmd_table_entry SCR_OP_COMPARE_VAR_TO_VALUE ScrCmd_compare_var_to_value, requests_effects=1 @ 0x21 + script_cmd_table_entry SCR_OP_COMPARE_VAR_TO_VAR ScrCmd_compare_var_to_var, requests_effects=1 @ 0x22 + script_cmd_table_entry SCR_OP_CALLNATIVE ScrCmd_callnative, requests_effects=1 @ 0x23 + script_cmd_table_entry SCR_OP_GOTONATIVE ScrCmd_gotonative, requests_effects=1 @ 0x24 + script_cmd_table_entry SCR_OP_SPECIAL ScrCmd_special, requests_effects=1 @ 0x25 + script_cmd_table_entry SCR_OP_SPECIALVAR ScrCmd_specialvar, requests_effects=1 @ 0x26 + script_cmd_table_entry SCR_OP_WAITSTATE ScrCmd_waitstate, requests_effects=1 @ 0x27 + script_cmd_table_entry SCR_OP_DELAY ScrCmd_delay, requests_effects=1 @ 0x28 + script_cmd_table_entry SCR_OP_SETFLAG ScrCmd_setflag, requests_effects=1 @ 0x29 + script_cmd_table_entry SCR_OP_CLEARFLAG ScrCmd_clearflag, requests_effects=1 @ 0x2a + script_cmd_table_entry SCR_OP_CHECKFLAG ScrCmd_checkflag, requests_effects=1 @ 0x2b + script_cmd_table_entry SCR_OP_INITCLOCK ScrCmd_initclock, requests_effects=1 @ 0x2c + script_cmd_table_entry SCR_OP_DOTIMEBASEDEVENTS ScrCmd_dotimebasedevents, requests_effects=1 @ 0x2d + script_cmd_table_entry SCR_OP_GETTIME ScrCmd_gettime, requests_effects=1 @ 0x2e + script_cmd_table_entry SCR_OP_PLAYSE ScrCmd_playse, requests_effects=1 @ 0x2f + script_cmd_table_entry SCR_OP_WAITSE ScrCmd_waitse, requests_effects=1 @ 0x30 + script_cmd_table_entry SCR_OP_PLAYFANFARE ScrCmd_playfanfare, requests_effects=1 @ 0x31 + script_cmd_table_entry SCR_OP_WAITFANFARE ScrCmd_waitfanfare, requests_effects=1 @ 0x32 + script_cmd_table_entry SCR_OP_PLAYBGM ScrCmd_playbgm, requests_effects=1 @ 0x33 + script_cmd_table_entry SCR_OP_SAVEBGM ScrCmd_savebgm, requests_effects=1 @ 0x34 + script_cmd_table_entry SCR_OP_FADEDEFAULTBGM ScrCmd_fadedefaultbgm, requests_effects=1 @ 0x35 + script_cmd_table_entry SCR_OP_FADENEWBGM ScrCmd_fadenewbgm, requests_effects=1 @ 0x36 + script_cmd_table_entry SCR_OP_FADEOUTBGM ScrCmd_fadeoutbgm, requests_effects=1 @ 0x37 + script_cmd_table_entry SCR_OP_FADEINBGM ScrCmd_fadeinbgm, requests_effects=1 @ 0x38 + script_cmd_table_entry SCR_OP_WARP ScrCmd_warp, requests_effects=1 @ 0x39 + script_cmd_table_entry SCR_OP_WARPSILENT ScrCmd_warpsilent, requests_effects=1 @ 0x3a + script_cmd_table_entry SCR_OP_WARPDOOR ScrCmd_warpdoor, requests_effects=1 @ 0x3b + script_cmd_table_entry SCR_OP_WARPHOLE ScrCmd_warphole, requests_effects=1 @ 0x3c + script_cmd_table_entry SCR_OP_WARPTELEPORT ScrCmd_warpteleport, requests_effects=1 @ 0x3d + script_cmd_table_entry SCR_OP_SETWARP ScrCmd_setwarp, requests_effects=1 @ 0x3e + script_cmd_table_entry SCR_OP_SETDYNAMICWARP ScrCmd_setdynamicwarp, requests_effects=1 @ 0x3f + script_cmd_table_entry SCR_OP_SETDIVEWARP ScrCmd_setdivewarp, requests_effects=1 @ 0x40 + script_cmd_table_entry SCR_OP_SETHOLEWARP ScrCmd_setholewarp, requests_effects=1 @ 0x41 + script_cmd_table_entry SCR_OP_GETPLAYERXY ScrCmd_getplayerxy, requests_effects=1 @ 0x42 + script_cmd_table_entry SCR_OP_GETPARTYSIZE ScrCmd_getpartysize, requests_effects=1 @ 0x43 + script_cmd_table_entry SCR_OP_ADDITEM ScrCmd_additem, requests_effects=1 @ 0x44 + script_cmd_table_entry SCR_OP_REMOVEITEM ScrCmd_removeitem, requests_effects=1 @ 0x45 + script_cmd_table_entry SCR_OP_CHECKITEMSPACE ScrCmd_checkitemspace, requests_effects=1 @ 0x46 + script_cmd_table_entry SCR_OP_CHECKITEM ScrCmd_checkitem, requests_effects=1 @ 0x47 + script_cmd_table_entry SCR_OP_CHECKITEMTYPE ScrCmd_checkitemtype, requests_effects=1 @ 0x48 + script_cmd_table_entry SCR_OP_ADDPCITEM ScrCmd_addpcitem, requests_effects=1 @ 0x49 + script_cmd_table_entry SCR_OP_CHECKPCITEM ScrCmd_checkpcitem, requests_effects=1 @ 0x4a + script_cmd_table_entry SCR_OP_ADDDECORATION ScrCmd_adddecoration, requests_effects=1 @ 0x4b + script_cmd_table_entry SCR_OP_REMOVEDECORATION ScrCmd_removedecoration, requests_effects=1 @ 0x4c + script_cmd_table_entry SCR_OP_CHECKDECOR ScrCmd_checkdecor, requests_effects=1 @ 0x4d + script_cmd_table_entry SCR_OP_CHECKDECORSPACE ScrCmd_checkdecorspace, requests_effects=1 @ 0x4e + script_cmd_table_entry SCR_OP_APPLYMOVEMENT ScrCmd_applymovement, requests_effects=1 @ 0x4f + script_cmd_table_entry SCR_OP_APPLYMOVEMENTAT ScrCmd_applymovementat, requests_effects=1 @ 0x50 + script_cmd_table_entry SCR_OP_WAITMOVEMENT ScrCmd_waitmovement, requests_effects=1 @ 0x51 + script_cmd_table_entry SCR_OP_WAITMOVEMENTAT ScrCmd_waitmovementat, requests_effects=1 @ 0x52 + script_cmd_table_entry SCR_OP_REMOVEOBJECT ScrCmd_removeobject, requests_effects=1 @ 0x53 + script_cmd_table_entry SCR_OP_REMOVEOBJECTAT ScrCmd_removeobjectat, requests_effects=1 @ 0x54 + script_cmd_table_entry SCR_OP_ADDOBJECT ScrCmd_addobject, requests_effects=1 @ 0x55 + script_cmd_table_entry SCR_OP_ADDOBJECTAT ScrCmd_addobjectat, requests_effects=1 @ 0x56 + script_cmd_table_entry SCR_OP_SETOBJECTXY ScrCmd_setobjectxy, requests_effects=1 @ 0x57 + script_cmd_table_entry SCR_OP_SHOWOBJECTAT ScrCmd_showobjectat, requests_effects=1 @ 0x58 + script_cmd_table_entry SCR_OP_HIDEOBJECTAT ScrCmd_hideobjectat, requests_effects=1 @ 0x59 + script_cmd_table_entry SCR_OP_FACEPLAYER ScrCmd_faceplayer, requests_effects=1 @ 0x5a + script_cmd_table_entry SCR_OP_TURNOBJECT ScrCmd_turnobject, requests_effects=1 @ 0x5b + script_cmd_table_entry SCR_OP_TRAINERBATTLE ScrCmd_trainerbattle, requests_effects=1 @ 0x5c + script_cmd_table_entry SCR_OP_DOTRAINERBATTLE ScrCmd_dotrainerbattle, requests_effects=1 @ 0x5d + script_cmd_table_entry SCR_OP_GOTOPOSTBATTLESCRIPT ScrCmd_gotopostbattlescript, requests_effects=1 @ 0x5e + script_cmd_table_entry SCR_OP_GOTOBEATENSCRIPT ScrCmd_gotobeatenscript, requests_effects=1 @ 0x5f + script_cmd_table_entry SCR_OP_CHECKTRAINERFLAG ScrCmd_checktrainerflag, requests_effects=1 @ 0x60 + script_cmd_table_entry SCR_OP_SETTRAINERFLAG ScrCmd_settrainerflag, requests_effects=1 @ 0x61 + script_cmd_table_entry SCR_OP_CLEARTRAINERFLAG ScrCmd_cleartrainerflag, requests_effects=1 @ 0x62 + script_cmd_table_entry SCR_OP_SETOBJECTXYPERM ScrCmd_setobjectxyperm, requests_effects=1 @ 0x63 + script_cmd_table_entry SCR_OP_COPYOBJECTXYTOPERM ScrCmd_copyobjectxytoperm, requests_effects=1 @ 0x64 + script_cmd_table_entry SCR_OP_SETOBJECTMOVEMENTTYPE ScrCmd_setobjectmovementtype, requests_effects=1 @ 0x65 + script_cmd_table_entry SCR_OP_WAITMESSAGE ScrCmd_waitmessage, requests_effects=1 @ 0x66 + script_cmd_table_entry SCR_OP_MESSAGE ScrCmd_message, requests_effects=1 @ 0x67 + script_cmd_table_entry SCR_OP_CLOSEMESSAGE ScrCmd_closemessage, requests_effects=1 @ 0x68 + script_cmd_table_entry SCR_OP_LOCKALL ScrCmd_lockall, requests_effects=1 @ 0x69 + script_cmd_table_entry SCR_OP_LOCK ScrCmd_lock, requests_effects=1 @ 0x6a + script_cmd_table_entry SCR_OP_RELEASEALL ScrCmd_releaseall, requests_effects=1 @ 0x6b + script_cmd_table_entry SCR_OP_RELEASE ScrCmd_release, requests_effects=1 @ 0x6c + script_cmd_table_entry SCR_OP_WAITBUTTONPRESS ScrCmd_waitbuttonpress, requests_effects=1 @ 0x6d + script_cmd_table_entry SCR_OP_YESNOBOX ScrCmd_yesnobox, requests_effects=1 @ 0x6e + script_cmd_table_entry SCR_OP_MULTICHOICE ScrCmd_multichoice, requests_effects=1 @ 0x6f + script_cmd_table_entry SCR_OP_MULTICHOICEDEFAULT ScrCmd_multichoicedefault, requests_effects=1 @ 0x70 + script_cmd_table_entry SCR_OP_MULTICHOICEGRID ScrCmd_multichoicegrid, requests_effects=1 @ 0x71 + script_cmd_table_entry SCR_OP_DRAWBOX ScrCmd_drawbox, requests_effects=1 @ 0x72 + script_cmd_table_entry SCR_OP_ERASEBOX ScrCmd_erasebox, requests_effects=1 @ 0x73 + script_cmd_table_entry SCR_OP_DRAWBOXTEXT ScrCmd_drawboxtext, requests_effects=1 @ 0x74 + script_cmd_table_entry SCR_OP_SHOWMONPIC ScrCmd_showmonpic, requests_effects=1 @ 0x75 + script_cmd_table_entry SCR_OP_HIDEMONPIC ScrCmd_hidemonpic, requests_effects=1 @ 0x76 + script_cmd_table_entry SCR_OP_SHOWCONTESTPAINTING ScrCmd_showcontestpainting, requests_effects=1 @ 0x77 + script_cmd_table_entry SCR_OP_BRAILLEMESSAGE ScrCmd_braillemessage, requests_effects=1 @ 0x78 + script_cmd_table_entry SCR_OP_GIVEMON ScrCmd_nop1, requests_effects=1 @ 0x79 + script_cmd_table_entry SCR_OP_GIVEEGG ScrCmd_giveegg, requests_effects=1 @ 0x7a + script_cmd_table_entry SCR_OP_SETMONMOVE ScrCmd_setmonmove, requests_effects=1 @ 0x7b + script_cmd_table_entry SCR_OP_CHECKPARTYMOVE ScrCmd_checkpartymove, requests_effects=1 @ 0x7c + script_cmd_table_entry SCR_OP_BUFFERSPECIESNAME ScrCmd_bufferspeciesname, requests_effects=1 @ 0x7d + script_cmd_table_entry SCR_OP_BUFFERLEADMONSPECIESNAME ScrCmd_bufferleadmonspeciesname, requests_effects=1 @ 0x7e + script_cmd_table_entry SCR_OP_BUFFERPARTYMONNICK ScrCmd_bufferpartymonnick, requests_effects=1 @ 0x7f + script_cmd_table_entry SCR_OP_BUFFERITEMNAME ScrCmd_bufferitemname, requests_effects=1 @ 0x80 + script_cmd_table_entry SCR_OP_BUFFERDECORATIONNAME ScrCmd_bufferdecorationname, requests_effects=1 @ 0x81 + script_cmd_table_entry SCR_OP_BUFFERMOVENAME ScrCmd_buffermovename, requests_effects=1 @ 0x82 + script_cmd_table_entry SCR_OP_BUFFERNUMBERSTRING ScrCmd_buffernumberstring, requests_effects=1 @ 0x83 + script_cmd_table_entry SCR_OP_BUFFERSTDSTRING ScrCmd_bufferstdstring, requests_effects=1 @ 0x84 + script_cmd_table_entry SCR_OP_BUFFERSTRING ScrCmd_bufferstring, requests_effects=1 @ 0x85 + script_cmd_table_entry SCR_OP_POKEMART ScrCmd_pokemart, requests_effects=1 @ 0x86 + script_cmd_table_entry SCR_OP_POKEMARTDECORATION ScrCmd_pokemartdecoration, requests_effects=1 @ 0x87 + script_cmd_table_entry SCR_OP_POKEMARTDECORATION2 ScrCmd_pokemartdecoration2, requests_effects=1 @ 0x88 + script_cmd_table_entry SCR_OP_PLAYSLOTMACHINE ScrCmd_playslotmachine, requests_effects=1 @ 0x89 + script_cmd_table_entry SCR_OP_SETBERRYTREE ScrCmd_setberrytree, requests_effects=1 @ 0x8a + script_cmd_table_entry SCR_OP_CHOOSECONTESTMON ScrCmd_choosecontestmon, requests_effects=1 @ 0x8b + script_cmd_table_entry SCR_OP_STARTCONTEST ScrCmd_startcontest, requests_effects=1 @ 0x8c + script_cmd_table_entry SCR_OP_SHOWCONTESTRESULTS ScrCmd_showcontestresults, requests_effects=1 @ 0x8d + script_cmd_table_entry SCR_OP_CONTESTLINKTRANSFER ScrCmd_contestlinktransfer, requests_effects=1 @ 0x8e + script_cmd_table_entry SCR_OP_RANDOM ScrCmd_random, requests_effects=1 @ 0x8f + script_cmd_table_entry SCR_OP_ADDMONEY ScrCmd_addmoney, requests_effects=1 @ 0x90 + script_cmd_table_entry SCR_OP_REMOVEMONEY ScrCmd_removemoney, requests_effects=1 @ 0x91 + script_cmd_table_entry SCR_OP_CHECKMONEY ScrCmd_checkmoney, requests_effects=1 @ 0x92 + script_cmd_table_entry SCR_OP_SHOWMONEYBOX ScrCmd_showmoneybox, requests_effects=1 @ 0x93 + script_cmd_table_entry SCR_OP_HIDEMONEYBOX ScrCmd_hidemoneybox, requests_effects=1 @ 0x94 + script_cmd_table_entry SCR_OP_UPDATEMONEYBOX ScrCmd_updatemoneybox, requests_effects=1 @ 0x95 + script_cmd_table_entry SCR_OP_GETPOKENEWSACTIVE ScrCmd_getpokenewsactive, requests_effects=1 @ 0x96 + script_cmd_table_entry SCR_OP_FADESCREEN ScrCmd_fadescreen, requests_effects=1 @ 0x97 + script_cmd_table_entry SCR_OP_FADESCREENSPEED ScrCmd_fadescreenspeed, requests_effects=1 @ 0x98 + script_cmd_table_entry SCR_OP_SETFLASHLEVEL ScrCmd_setflashlevel, requests_effects=1 @ 0x99 + script_cmd_table_entry SCR_OP_ANIMATEFLASH ScrCmd_animateflash, requests_effects=1 @ 0x9a + script_cmd_table_entry SCR_OP_MESSAGEAUTOSCROLL ScrCmd_messageautoscroll, requests_effects=1 @ 0x9b + script_cmd_table_entry SCR_OP_DOFIELDEFFECT ScrCmd_dofieldeffect, requests_effects=1 @ 0x9c + script_cmd_table_entry SCR_OP_SETFIELDEFFECTARGUMENT ScrCmd_setfieldeffectargument, requests_effects=1 @ 0x9d + script_cmd_table_entry SCR_OP_WAITFIELDEFFECT ScrCmd_waitfieldeffect, requests_effects=1 @ 0x9e + script_cmd_table_entry SCR_OP_SETRESPAWN ScrCmd_setrespawn, requests_effects=1 @ 0x9f + script_cmd_table_entry SCR_OP_CHECKPLAYERGENDER ScrCmd_checkplayergender, requests_effects=1 @ 0xa0 + script_cmd_table_entry SCR_OP_PLAYMONCRY ScrCmd_playmoncry, requests_effects=1 @ 0xa1 + script_cmd_table_entry SCR_OP_SETMETATILE ScrCmd_setmetatile, requests_effects=1 @ 0xa2 + script_cmd_table_entry SCR_OP_RESETWEATHER ScrCmd_resetweather, requests_effects=1 @ 0xa3 + script_cmd_table_entry SCR_OP_SETWEATHER ScrCmd_setweather, requests_effects=1 @ 0xa4 + script_cmd_table_entry SCR_OP_DOWEATHER ScrCmd_doweather, requests_effects=1 @ 0xa5 + script_cmd_table_entry SCR_OP_SETSTEPCALLBACK ScrCmd_setstepcallback, requests_effects=1 @ 0xa6 + script_cmd_table_entry SCR_OP_SETMAPLAYOUTINDEX ScrCmd_setmaplayoutindex, requests_effects=1 @ 0xa7 + script_cmd_table_entry SCR_OP_SETOBJECTSUBPRIORITY ScrCmd_setobjectsubpriority, requests_effects=1 @ 0xa8 + script_cmd_table_entry SCR_OP_RESETOBJECTSUBPRIORITY ScrCmd_resetobjectsubpriority, requests_effects=1 @ 0xa9 + script_cmd_table_entry SCR_OP_CREATEVOBJECT ScrCmd_createvobject, requests_effects=1 @ 0xaa + script_cmd_table_entry SCR_OP_TURNVOBJECT ScrCmd_turnvobject, requests_effects=1 @ 0xab + script_cmd_table_entry SCR_OP_OPENDOOR ScrCmd_opendoor, requests_effects=1 @ 0xac + script_cmd_table_entry SCR_OP_CLOSEDOOR ScrCmd_closedoor, requests_effects=1 @ 0xad + script_cmd_table_entry SCR_OP_WAITDOORANIM ScrCmd_waitdooranim, requests_effects=1 @ 0xae + script_cmd_table_entry SCR_OP_SETDOOROPEN ScrCmd_setdooropen, requests_effects=1 @ 0xaf + script_cmd_table_entry SCR_OP_SETDOORCLOSED ScrCmd_setdoorclosed, requests_effects=1 @ 0xb0 + script_cmd_table_entry SCR_OP_ADDELEVMENUITEM ScrCmd_addelevmenuitem, requests_effects=1 @ 0xb1 + script_cmd_table_entry SCR_OP_SHOWELEVMENU ScrCmd_showelevmenu, requests_effects=1 @ 0xb2 + script_cmd_table_entry SCR_OP_CHECKCOINS ScrCmd_checkcoins, requests_effects=1 @ 0xb3 + script_cmd_table_entry SCR_OP_ADDCOINS ScrCmd_addcoins, requests_effects=1 @ 0xb4 + script_cmd_table_entry SCR_OP_REMOVECOINS ScrCmd_removecoins, requests_effects=1 @ 0xb5 + script_cmd_table_entry SCR_OP_SETWILDBATTLE ScrCmd_setwildbattle, requests_effects=1 @ 0xb6 + script_cmd_table_entry SCR_OP_DOWILDBATTLE ScrCmd_dowildbattle, requests_effects=1 @ 0xb7 + script_cmd_table_entry SCR_OP_SETVADDRESS ScrCmd_setvaddress, requests_effects=1 @ 0xb8 + script_cmd_table_entry SCR_OP_VGOTO ScrCmd_vgoto, requests_effects=1 @ 0xb9 + script_cmd_table_entry SCR_OP_VCALL ScrCmd_vcall, requests_effects=1 @ 0xba + script_cmd_table_entry SCR_OP_VGOTO_IF ScrCmd_vgoto_if, requests_effects=1 @ 0xbb + script_cmd_table_entry SCR_OP_VCALL_IF ScrCmd_vcall_if, requests_effects=1 @ 0xbc + script_cmd_table_entry SCR_OP_VMESSAGE ScrCmd_vmessage, requests_effects=1 @ 0xbd + script_cmd_table_entry SCR_OP_VBUFFERMESSAGE ScrCmd_vbuffermessage, requests_effects=1 @ 0xbe + script_cmd_table_entry SCR_OP_VBUFFERSTRING ScrCmd_vbufferstring, requests_effects=1 @ 0xbf + script_cmd_table_entry SCR_OP_SHOWCOINSBOX ScrCmd_showcoinsbox, requests_effects=1 @ 0xc0 + script_cmd_table_entry SCR_OP_HIDECOINSBOX ScrCmd_hidecoinsbox, requests_effects=1 @ 0xc1 + script_cmd_table_entry SCR_OP_UPDATECOINSBOX ScrCmd_updatecoinsbox, requests_effects=1 @ 0xc2 + script_cmd_table_entry SCR_OP_INCREMENTGAMESTAT ScrCmd_incrementgamestat, requests_effects=1 @ 0xc3 + script_cmd_table_entry SCR_OP_SETESCAPEWARP ScrCmd_setescapewarp, requests_effects=1 @ 0xc4 + script_cmd_table_entry SCR_OP_WAITMONCRY ScrCmd_waitmoncry, requests_effects=1 @ 0xc5 + script_cmd_table_entry SCR_OP_BUFFERBOXNAME ScrCmd_bufferboxname, requests_effects=1 @ 0xc6 + script_cmd_table_entry SCR_OP_TEXTCOLOR ScrCmd_nop1, requests_effects=1 @ 0xc7 + script_cmd_table_entry SCR_OP_LOADHELP ScrCmd_nop1, requests_effects=1 @ 0xc8 + script_cmd_table_entry SCR_OP_UNLOADHELP ScrCmd_nop1, requests_effects=1 @ 0xc9 + script_cmd_table_entry SCR_OP_SIGNMSG ScrCmd_nop1, requests_effects=1 @ 0xca + script_cmd_table_entry SCR_OP_NORMALMSG ScrCmd_nop1, requests_effects=1 @ 0xcb + script_cmd_table_entry SCR_OP_COMPAREHIDDENVAR ScrCmd_nop1, requests_effects=1 @ 0xcc + script_cmd_table_entry SCR_OP_SETMODERNFATEFULENCOUNTER ScrCmd_setmodernfatefulencounter, requests_effects=1 @ 0xcd + script_cmd_table_entry SCR_OP_CHECKMODERNFATEFULENCOUNTER ScrCmd_checkmodernfatefulencounter, requests_effects=1 @ 0xce + script_cmd_table_entry SCR_OP_TRYWONDERCARDSCRIPT ScrCmd_trywondercardscript, requests_effects=1 @ 0xcf + script_cmd_table_entry SCR_OP_SETWORLDMAPFLAG ScrCmd_nop1, requests_effects=1 @ 0xd0 + script_cmd_table_entry SCR_OP_WARPSPINENTER ScrCmd_warpspinenter, requests_effects=1 @ 0xd1 + script_cmd_table_entry SCR_OP_SETMONMETLOCATION ScrCmd_setmonmetlocation, requests_effects=1 @ 0xd2 + script_cmd_table_entry SCR_OP_MOVEROTATINGTILEOBJECTS ScrCmd_moverotatingtileobjects, requests_effects=1 @ 0xd3 + script_cmd_table_entry SCR_OP_TURNROTATINGTILEOBJECTS ScrCmd_turnrotatingtileobjects, requests_effects=1 @ 0xd4 + script_cmd_table_entry SCR_OP_INITROTATINGTILEPUZZLE ScrCmd_initrotatingtilepuzzle, requests_effects=1 @ 0xd5 + script_cmd_table_entry SCR_OP_FREEROTATINGTILEPUZZLE ScrCmd_freerotatingtilepuzzle, requests_effects=1 @ 0xd6 + script_cmd_table_entry SCR_OP_WARPMOSSDEEPGYM ScrCmd_warpmossdeepgym, requests_effects=1 @ 0xd7 + script_cmd_table_entry SCR_OP_SELECTAPPROACHINGTRAINER ScrCmd_selectapproachingtrainer, requests_effects=1 @ 0xd8 + script_cmd_table_entry SCR_OP_LOCKFORTRAINER ScrCmd_lockfortrainer, requests_effects=1 @ 0xd9 + script_cmd_table_entry SCR_OP_CLOSEBRAILLEMESSAGE ScrCmd_closebraillemessage, requests_effects=1 @ 0xda + script_cmd_table_entry SCR_OP_MESSAGEINSTANT ScrCmd_messageinstant, requests_effects=1 @ 0xdb + script_cmd_table_entry SCR_OP_FADESCREENSWAPBUFFERS ScrCmd_fadescreenswapbuffers, requests_effects=1 @ 0xdc + script_cmd_table_entry SCR_OP_BUFFERTRAINERCLASSNAME ScrCmd_buffertrainerclassname, requests_effects=1 @ 0xdd + script_cmd_table_entry SCR_OP_BUFFERTRAINERNAME ScrCmd_buffertrainername, requests_effects=1 @ 0xde + script_cmd_table_entry SCR_OP_POKENAVCALL ScrCmd_pokenavcall, requests_effects=1 @ 0xdf + script_cmd_table_entry SCR_OP_WARPWHITEFADE ScrCmd_warpwhitefade, requests_effects=1 @ 0xe0 + script_cmd_table_entry SCR_OP_BUFFERCONTESTNAME ScrCmd_buffercontestname, requests_effects=1 @ 0xe1 + script_cmd_table_entry SCR_OP_BUFFERITEMNAMEPLURAL ScrCmd_bufferitemnameplural, requests_effects=1 @ 0xe2 + script_cmd_table_entry SCR_OP_DYNMULTICHOICE ScrCmd_dynmultichoice, requests_effects=1 @ 0xe3 + script_cmd_table_entry SCR_OP_DYNMULTIPUSH ScrCmd_dynmultipush, requests_effects=1 @ 0xe4 + .if ALLOCATE_SCRIPT_CMD_TABLE gScriptCmdTableEnd:: .4byte ScrCmd_nop + .endif diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index a336360436..7c16242ef9 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -18,7 +18,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard:: end MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Play his current song special PlayBardSong delay 60 special HasBardSongBeenChanged @@ -45,7 +45,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: faceplayer goto_if_eq VAR_RESULT, 0, MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE @ Play the new song special PlayBardSong delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO diff --git a/graphics/cave_transition/enter.pal b/graphics/cave_transition/enter.pal index fea15a1765..ec7a2b50e7 100644 --- a/graphics/cave_transition/enter.pal +++ b/graphics/cave_transition/enter.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -8 +16 148 197 172 16 16 16 32 32 32 @@ -9,3 +9,11 @@ JASC-PAL 82 82 82 98 98 98 115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 diff --git a/graphics/cave_transition/exit.pal b/graphics/cave_transition/exit.pal deleted file mode 100644 index 09eb37624a..0000000000 --- a/graphics/cave_transition/exit.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -131 131 131 -148 148 148 -164 164 164 -180 180 180 -197 197 197 -213 213 213 -230 230 230 -255 255 255 diff --git a/include/bard_music.h b/include/bard_music.h index b1d051b8d7..6dcf966f67 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -1,41 +1,49 @@ #ifndef GUARD_BARD_MUSIC_H #define GUARD_BARD_MUSIC_H -#define BARD_SOUND_MAX_LENGTH 6 +// The maximum number of BardSoundTemplates/BardSounds there can be for each easy chat word. +#define MAX_BARD_SOUNDS_PER_WORD 6 -struct BardSound +// The number of pitch tables there are for each pitch table size (see sPitchTables). +#define NUM_BARD_PITCH_TABLES_PER_SIZE 5 + +// This struct describes which phoneme song to play for the sound, and whether to +// make any adjustments to its length or volume. Very few sounds make any adjustments. +struct BardSoundTemplate { - /*0x00*/ u8 songLengthId; - /*0x01*/ s8 songLengthOffset; - /*0x02*/ u16 unused; - /*0x04*/ s16 volume; - /*0x06*/ u16 unused2; + u8 songId; + s8 lengthAdjustment; + u16 unused; // Only set on EC_WORD_WAAAH, and never read. + s16 volume; }; -struct BardPhoneme +// This is the length and pitch to play the phoneme song at. +// These will be calculated in 'CalcWordSounds'. +struct BardSound { - /*0x00*/ u16 length; - /*0x02*/ u16 pitch; + u16 length; + u16 pitch; }; struct BardSong { - /*0x00*/ u8 currWord; - /*0x01*/ u8 currPhoneme; - /*0x02*/ u8 phonemeTimer; - /*0x03*/ u8 state; - /*0x04*/ s16 length; - /*0x06*/ u16 volume; - /*0x08*/ s16 pitch; - /*0x0A*/ s16 voiceInflection; - /*0x0C*/ u16 lyrics[BARD_SOUND_MAX_LENGTH]; - /*0x18*/ struct BardPhoneme phonemes[BARD_SOUND_MAX_LENGTH]; - /*0x30*/ const struct BardSound *sound; + u8 lyricsIndex; + u8 soundIndex; + u8 timer; + u8 state; + s16 length; // Length of the sound for the word currently being sung (i.e. the sum of 'length' in all the current word's phonemes). + u16 volume; + s16 pitch; + s16 voiceInflection; + u16 lyrics[NUM_BARD_SONG_WORDS]; + struct BardSound sounds[MAX_BARD_SOUNDS_PER_WORD]; + const struct BardSoundTemplate *soundTemplates; }; extern const u16 gNumBardWords_Species; extern const u16 gNumBardWords_Moves; -const struct BardSound *GetWordSounds(u16 word); -void GetWordPhonemes(struct BardSong *song, u16 word); + +const struct BardSoundTemplate *GetWordSoundTemplates(u16 easyChatWord); +void CalcWordSounds(struct BardSong *song, u16 pitchTableIndex); #endif //GUARD_BARD_MUSIC_H diff --git a/include/config/battle.h b/include/config/battle.h index 016b8044cc..40e2e42770 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -158,7 +158,7 @@ // In Gen3, Effect Spore has a 10% chance to sleep, poison or paralyze, with an equal chance. // In Gen4, it's 30%. In Gen5+ it has 11% to sleep, 9% chance to poison and 10% chance to paralyze. #define B_PICKUP_WILD GEN_LATEST // In Gen9+, Pickup allows its user to pickup its own used item at the end of the turn in wild battles. -#define B_MAGIC_GUARD GEN_LATEST // In Gen4+, Magic Guard ignores immobilization caused by paralysis +#define B_MAGIC_GUARD GEN_LATEST // In Gen4 only, Magic Guard ignores immobilization caused by paralysis // Item settings #define B_HP_BERRIES GEN_LATEST // In Gen4+, berries which restore HP activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn. @@ -300,4 +300,7 @@ #define B_ENEMY_MON_SHADOW_STYLE GEN_3 // In Gen4+, all enemy Pokemon will have a shadow drawn beneath them. // Currently Gen4+ shadows don't properly work with Trainerslides +// Battle UI settings +#define B_MOVE_REARRANGEMENT_IN_BATTLE GEN_LATEST // In Gen 4+ move slots cannot be rearranged in battle + #endif // GUARD_CONFIG_BATTLE_H diff --git a/include/config/dexnav.h b/include/config/dexnav.h index 20d05f7a23..7b4e3ba285 100644 --- a/include/config/dexnav.h +++ b/include/config/dexnav.h @@ -5,11 +5,11 @@ #define USE_DEXNAV_SEARCH_LEVELS FALSE /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */ // Flag/var defines -#define FLAG_SYS_DEXNAV_SEARCH 0 // Searching for mon -#define FLAG_SYS_DEXNAV_GET 0 // DexNav shows in start menu -#define FLAG_SYS_DETECTOR_MODE 0 // Allow player to find hidden mons -#define VAR_DEXNAV_SPECIES 0 // Registered DexNav species -#define VAR_DEXNAV_STEP_COUNTER 0 // Steps for finding hidden pokemon +#define DN_FLAG_SEARCHING 0 // Searching for mon +#define DN_FLAG_DEXNAV_GET 0 // DexNav shows in start menu +#define DN_FLAG_DETECTOR_MODE 0 // Allow player to find hidden mons +#define DN_VAR_SPECIES 0 // Registered DexNav species +#define DN_VAR_STEP_COUNTER 0 // Steps for finding hidden pokemon // Search parameters #define DEXNAV_TIMEOUT 15 // 15 seconds is the time out. Max of 1092 seconds allowed diff --git a/include/config/overworld.h b/include/config/overworld.h index 38460f6027..218df4ac3a 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -55,8 +55,10 @@ #define OW_MON_WANDER_WALK TRUE // If true, OW pokemon with MOVEMENT_TYPE_WANDER will walk-in-place in between steps. // Follower Pokémon #define OW_FOLLOWERS_ENABLED FALSE // Enables follower Pokémon, HGSS style. Requires OW_POKEMON_OBJECT_EVENTS. Note that additional scripting may be required for them to be fully supported! -#define OW_FOLLOWERS_BOBBING TRUE // If true, follower pokemon will bob up and down during their idle & walking animations -#define OW_FOLLOWERS_POKEBALLS TRUE // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball +#define OW_FOLLOWERS_BOBBING TRUE // If TRUE, follower Pokémon will bob up and down during their idle & walking animations +#define OW_FOLLOWERS_POKEBALLS TRUE // If TRUE, follower Pokémon will emerge from the Poké Ball they are stored in, instead of a normal Poké Ball +#define OW_FOLLOWERS_WEATHER_FORMS FALSE // If TRUE, Castform and Cherrim gain FORM_CHANGE_OVERWORLD_WEATHER, which will make them transform in the overworld based on the weather. +#define OW_FOLLOWERS_COPY_WILD_PKMN FALSE // If TRUE, follower Pokémon that know Transform or have Illusion/Imposter will copy wild Pokémon at random. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8+, if a Pokémon with Synchronize leads the party, wild Pokémon will always have their same Nature as opposed to the 50% chance in previous games. Gift Pokémon excluded. diff --git a/include/constants/contest.h b/include/constants/contest.h index c9e11cd992..3b83d4f1c3 100644 --- a/include/constants/contest.h +++ b/include/constants/contest.h @@ -155,6 +155,7 @@ #define CONTEST_EFFECT_TYPE_WORSEN 4 #define CONTEST_EFFECT_TYPE_SPECIAL_APPEAL 5 #define CONTEST_EFFECT_TYPE_TURN_ORDER 6 +#define CONTEST_EFFECT_TYPE_UNKNOWN 8 #define COMBO_STARTER_POUND 1 #define COMBO_STARTER_FIRE_PUNCH 2 diff --git a/include/constants/form_change_types.h b/include/constants/form_change_types.h index 8af9740cad..8cf2e37e1b 100644 --- a/include/constants/form_change_types.h +++ b/include/constants/form_change_types.h @@ -144,4 +144,11 @@ // param2: ability to check, optional #define FORM_CHANGE_BATTLE_BEFORE_MOVE_CATEGORY 25 +// Form change that activates when overworld weather changes. +// param1: weather to check. +#define FORM_CHANGE_OVERWORLD_WEATHER 26 + +// Form change that activates when the Pokémon is deposited into the PC or Daycare. +#define FORM_CHANGE_DEPOSIT 27 + #endif // GUARD_CONSTANTS_FORM_CHANGE_TYPES_H diff --git a/include/constants/global.h b/include/constants/global.h index 3476bd3680..76e6847c40 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -129,7 +129,7 @@ #define FEMALE 1 #define GENDER_COUNT 2 -#define BARD_SONG_LENGTH 6 +#define NUM_BARD_SONG_WORDS 6 #define NUM_STORYTELLER_TALES 4 #define NUM_TRADER_ITEMS 4 #define GIDDY_MAX_TALES 10 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 86ddde5032..4883077a93 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -169,6 +169,7 @@ #define LEVEL_UP_MOVE_END 0xFFFF #define MAX_LEVEL_UP_MOVES 20 +#define MAX_RELEARNER_MOVES max(MAX_LEVEL_UP_MOVES, 25) #define MON_MALE 0x00 #define MON_FEMALE 0xFE diff --git a/include/constants/songs.h b/include/constants/songs.h index a8782494ee..104a4b3606 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -492,6 +492,8 @@ #define MUS_RG_TEACHY_TV_MENU 558 // MUS_RG_TVNOIZE #define END_MUS MUS_RG_TEACHY_TV_MENU +// These PH_* constants are phoneme sounds used by the "bard" NPC (see src/bard_music.c and src/mauville_old_man.c). +// Each comes in a triplet of PH_*_BLEND, PH_*_HELD, and PH_*_SOLO, and the name of each triplet incorporates the English phonetic sound it represents. #define PH_TRAP_BLEND 559 #define PH_TRAP_HELD 560 #define PH_TRAP_SOLO 561 @@ -548,4 +550,10 @@ #define MUS_NONE 0xFFFF +#define FIRST_PHONEME_SONG PH_TRAP_BLEND +#define LAST_PHONEME_SONG PH_NURSE_SOLO +#define NUM_PHONEME_SONGS (LAST_PHONEME_SONG - FIRST_PHONEME_SONG + 1) +#define PHONEME_ID(song) ((song) - FIRST_PHONEME_SONG) +#define PHONEME_ID_NONE 0xFF + #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index e79919c329..1b71134593 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -4,7 +4,7 @@ #define VARS_START 0x4000 // temporary vars -// The first 0x10 vars are are temporary--they are cleared every time a map is loaded. +// The first 0x10 vars are temporary--they are cleared every time a map is loaded. #define TEMP_VARS_START 0x4000 #define VAR_TEMP_0 (TEMP_VARS_START + 0x0) #define VAR_TEMP_1 (TEMP_VARS_START + 0x1) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 6994892578..d7999ee1f9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -148,6 +148,7 @@ void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sp void ObjectEventClearHeldMovement(struct ObjectEvent *); void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); struct Pokemon *GetFirstLiveMon(void); +u16 GetOverworldWeatherSpecies(u16 species); void UpdateFollowingPokemon(void); void RemoveFollowingPokemon(void); struct ObjectEvent *GetFollowerObject(void); diff --git a/include/global.h b/include/global.h index 586bb374b8..f5c4360072 100644 --- a/include/global.h +++ b/include/global.h @@ -687,8 +687,8 @@ struct MauvilleManBard { /*0x00*/ u8 id; /*0x01*/ //u8 padding1; - /*0x02*/ u16 songLyrics[BARD_SONG_LENGTH]; - /*0x0E*/ u16 temporaryLyrics[BARD_SONG_LENGTH]; + /*0x02*/ u16 songLyrics[NUM_BARD_SONG_WORDS]; + /*0x0E*/ u16 newSongLyrics[NUM_BARD_SONG_WORDS]; /*0x1A*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x22*/ u8 filler_2DB6[0x3]; /*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH]; diff --git a/include/rotating_gate.h b/include/rotating_gate.h index fd86a6b04d..3829edab4a 100644 --- a/include/rotating_gate.h +++ b/include/rotating_gate.h @@ -1,9 +1,9 @@ #ifndef GUARD_ROTATING_GATE_H #define GUARD_ROTATING_GATE_H -void RotatingGatePuzzleCameraUpdate(s16, s16); +void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY); void RotatingGate_InitPuzzleAndGraphics(void); -u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); -bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16); +bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y); +bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y); #endif // GUARD_ROTATING_GATE_H diff --git a/include/sprite.h b/include/sprite.h index 553fdb2b83..40ee6f6a87 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -1,6 +1,7 @@ #ifndef GUARD_SPRITE_H #define GUARD_SPRITE_H +#define OAM_MATRIX_COUNT 32 #define MAX_SPRITES 64 #define SPRITE_NONE 0xFF #define TAG_NONE 0xFFFF @@ -260,12 +261,12 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern const struct SpriteTemplate gDummySpriteTemplate; extern u8 gReservedSpritePaletteCount; -extern struct Sprite gSprites[]; +extern struct Sprite gSprites[MAX_SPRITES + 1]; extern u8 gOamLimit; extern u16 gReservedSpriteTileCount; extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; -extern struct OamMatrix gOamMatrices[]; +extern struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT]; extern bool8 gAffineAnimsDisabled; void ResetSpriteData(void); diff --git a/include/test/overworld_script.h b/include/test/overworld_script.h index 9b85f82ac3..e849f87e0c 100644 --- a/include/test/overworld_script.h +++ b/include/test/overworld_script.h @@ -54,6 +54,8 @@ asm(".set FALSE, 0\n" asm(".include \"constants/gba_constants.inc\"\n"); // Make overworld script macros available. -asm(".include \"asm/macros/event.inc\"\n"); +asm(".include \"constants/gba_constants.inc\"\n" + ".include \"asm/macros/asm.inc\"\n" + ".include \"asm/macros/event.inc\"\n"); #endif diff --git a/src/bard_music.c b/src/bard_music.c index 369a2767d1..3335e2428f 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -1,63 +1,247 @@ #include "global.h" #include "bard_music.h" #include "easy_chat.h" +#include "constants/songs.h" -#include "data/bard_music/bard_sounds.h" -#include "data/bard_music/word_pitch.h" -#include "data/bard_music/default_sound.h" -#include "data/bard_music/length_table.h" +// Indicates that the previous sound should be held. +#define PREV_BARD_SOUND { .songId = NUM_PHONEME_SONGS } -static s16 CalcWordPitch(int pitchIdx, int songPos) +// Invalid sound, indicates the end of the sounds for the word. +#define NULL_BARD_SOUND { .songId = PHONEME_ID_NONE } + +#include "data/bard_music/pokemon.h" +#include "data/bard_music/moves.h" +#include "data/bard_music/trainer.h" +#include "data/bard_music/status.h" +#include "data/bard_music/battle.h" +#include "data/bard_music/greetings.h" +#include "data/bard_music/people.h" +#include "data/bard_music/voices.h" +#include "data/bard_music/speech.h" +#include "data/bard_music/endings.h" +#include "data/bard_music/feelings.h" +#include "data/bard_music/conditions.h" +#include "data/bard_music/actions.h" +#include "data/bard_music/lifestyle.h" +#include "data/bard_music/hobbies.h" +#include "data/bard_music/time.h" +#include "data/bard_music/misc.h" +#include "data/bard_music/adjectives.h" +#include "data/bard_music/events.h" +#include "data/bard_music/trendysaying.h" + +static const struct BardSoundTemplate (*const sBardSoundTemplatesTable[EC_NUM_GROUPS])[MAX_BARD_SOUNDS_PER_WORD] = { + [EC_GROUP_POKEMON] = NULL, // Handled by sBardSoundTemplates_Pokemon + [EC_GROUP_TRAINER] = sBardSoundTemplates_Trainer, + [EC_GROUP_STATUS] = sBardSoundTemplates_Status, + [EC_GROUP_BATTLE] = sBardSoundTemplates_Battle, + [EC_GROUP_GREETINGS] = sBardSoundTemplates_Greetings, + [EC_GROUP_PEOPLE] = sBardSoundTemplates_People, + [EC_GROUP_VOICES] = sBardSoundTemplates_Voices, + [EC_GROUP_SPEECH] = sBardSoundTemplates_Speech, + [EC_GROUP_ENDINGS] = sBardSoundTemplates_Endings, + [EC_GROUP_FEELINGS] = sBardSoundTemplates_Feelings, + [EC_GROUP_CONDITIONS] = sBardSoundTemplates_Conditions, + [EC_GROUP_ACTIONS] = sBardSoundTemplates_Actions, + [EC_GROUP_LIFESTYLE] = sBardSoundTemplates_Lifestyle, + [EC_GROUP_HOBBIES] = sBardSoundTemplates_Hobbies, + [EC_GROUP_TIME] = sBardSoundTemplates_Time, + [EC_GROUP_MISC] = sBardSoundTemplates_Misc, + [EC_GROUP_ADJECTIVES] = sBardSoundTemplates_Adjectives, + [EC_GROUP_EVENTS] = sBardSoundTemplates_Events, + [EC_GROUP_MOVE_1] = NULL, // Handled by sBardSoundTemplates_Moves + [EC_GROUP_MOVE_2] = NULL, // Handled by sBardSoundTemplates_Moves + [EC_GROUP_TRENDY_SAYING] = sBardSoundTemplates_TrendySaying, + [EC_GROUP_POKEMON_NATIONAL] = NULL, // Handled by sBardSoundTemplates_Pokemon +}; + +// The pitch tables below will be indexed using the number of BardSoundTemplates per word, so a table is selected +// that has at least MAX_BARD_SOUNDS_PER_WORD pitch values. Curiously they select pitch tables whose size is +1 +// of the maximum number of sounds per word, so the final pitch value (before PITCH_END) isn't used. +// (i.e., 'NUM_BARD_PITCH_TABLES_PER_SIZE * (MAX_BARD_SOUNDS_PER_WORD-1)' would select a sufficiently large table). +#define BASE_PITCH_TABLE_INDEX (NUM_BARD_PITCH_TABLES_PER_SIZE * MAX_BARD_SOUNDS_PER_WORD) + +#define PITCH_END 0x1800 + +static const s16 sPitch1_0[] = { -0x300, PITCH_END }; +static const s16 sPitch1_1[] = { 0x0900, PITCH_END }; +static const s16 sPitch1_2[] = { 0x0100, PITCH_END }; +static const s16 sPitch1_3[] = { 0x0400, PITCH_END }; +static const s16 sPitch1_4[] = { 0x0b00, PITCH_END }; + +static const s16 sPitch2_0[] = { -0x300, -0x100, PITCH_END }; +static const s16 sPitch2_1[] = { -0x300, 0x0200, PITCH_END }; +static const s16 sPitch2_2[] = { 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch2_3[] = { 0x0600, 0x0800, PITCH_END }; +static const s16 sPitch2_4[] = { 0x0900, 0x0800, PITCH_END }; + +static const s16 sPitch3_0[] = { -0x300, -0x100, -0x300, PITCH_END }; +static const s16 sPitch3_1[] = { 0x0400, -0x300, 0x0400, PITCH_END }; +static const s16 sPitch3_2[] = { 0x0900, 0x0800, 0x0600, PITCH_END }; +static const s16 sPitch3_3[] = { 0x0100, 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch3_4[] = { 0x0600, 0x1000, 0x0d00, PITCH_END }; + +static const s16 sPitch4_0[] = { 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END }; +static const s16 sPitch4_1[] = { 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END }; +static const s16 sPitch4_2[] = { 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; +static const s16 sPitch4_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch4_4[] = { 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END }; + +static const s16 sPitch5_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch5_1[] = { 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch5_2[] = { 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END }; +static const s16 sPitch5_3[] = { 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END }; +static const s16 sPitch5_4[] = { 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END }; + +static const s16 sPitch6_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; +static const s16 sPitch6_1[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END }; +static const s16 sPitch6_2[] = { 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END }; +static const s16 sPitch6_3[] = { 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END }; +static const s16 sPitch6_4[] = { 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END }; + +static const s16 sPitch7_0[] = { 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch7_1[] = { 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END }; +static const s16 sPitch7_2[] = { 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END }; +static const s16 sPitch7_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END }; +static const s16 sPitch7_4[] = { 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END }; + +// In practice only sPitch7_# below are used below. +// BASE_PITCH_TABLE_INDEX is 30 by default, and this table is always indexed with (x + 30), where x is some value 0 - 4 +static const s16 *const sPitchTables[NUM_BARD_PITCH_TABLES_PER_SIZE * 7] = { + sPitch1_0, sPitch1_1, sPitch1_2, sPitch1_3, sPitch1_4, + sPitch2_0, sPitch2_1, sPitch2_2, sPitch2_3, sPitch2_4, + sPitch3_0, sPitch3_1, sPitch3_2, sPitch3_3, sPitch3_4, + sPitch4_0, sPitch4_1, sPitch4_2, sPitch4_3, sPitch4_4, + sPitch5_0, sPitch5_1, sPitch5_2, sPitch5_3, sPitch5_4, + sPitch6_0, sPitch6_1, sPitch6_2, sPitch6_3, sPitch6_4, + sPitch7_0, sPitch7_1, sPitch7_2, sPitch7_3, sPitch7_4 +}; + +// If this fails, CalcWordSounds will likely read out of bounds for sPitchTables. +STATIC_ASSERT(BASE_PITCH_TABLE_INDEX + (NUM_BARD_PITCH_TABLES_PER_SIZE-1) < ARRAY_COUNT(sPitchTables), NotEnoughPitchTablesForBardSounds) + +static const struct BardSoundTemplate sEmptyPhonemeTemplate[] = { + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND +}; + +static const int sPhonemeLengths[NUM_PHONEME_SONGS + 1] = { + [PHONEME_ID(PH_TRAP_BLEND)] = 9, + [PHONEME_ID(PH_TRAP_HELD)] = 22, + [PHONEME_ID(PH_TRAP_SOLO)] = 15, + [PHONEME_ID(PH_FACE_BLEND)] = 16, + [PHONEME_ID(PH_FACE_HELD)] = 39, + [PHONEME_ID(PH_FACE_SOLO)] = 21, + [PHONEME_ID(PH_CLOTH_BLEND)] = 9, + [PHONEME_ID(PH_CLOTH_HELD)] = 30, + [PHONEME_ID(PH_CLOTH_SOLO)] = 24, + [PHONEME_ID(PH_DRESS_BLEND)] = 15, + [PHONEME_ID(PH_DRESS_HELD)] = 25, + [PHONEME_ID(PH_DRESS_SOLO)] = 12, + [PHONEME_ID(PH_FLEECE_BLEND)] = 22, + [PHONEME_ID(PH_FLEECE_HELD)] = 45, + [PHONEME_ID(PH_FLEECE_SOLO)] = 24, + [PHONEME_ID(PH_KIT_BLEND)] = 15, + [PHONEME_ID(PH_KIT_HELD)] = 40, + [PHONEME_ID(PH_KIT_SOLO)] = 9, + [PHONEME_ID(PH_PRICE_BLEND)] = 21, + [PHONEME_ID(PH_PRICE_HELD)] = 42, + [PHONEME_ID(PH_PRICE_SOLO)] = 18, + [PHONEME_ID(PH_LOT_BLEND)] = 9, + [PHONEME_ID(PH_LOT_HELD)] = 22, + [PHONEME_ID(PH_LOT_SOLO)] = 15, + [PHONEME_ID(PH_GOAT_BLEND)] = 27, + [PHONEME_ID(PH_GOAT_HELD)] = 48, + [PHONEME_ID(PH_GOAT_SOLO)] = 18, + [PHONEME_ID(PH_THOUGHT_BLEND)] = 27, + [PHONEME_ID(PH_THOUGHT_HELD)] = 33, + [PHONEME_ID(PH_THOUGHT_SOLO)] = 24, + [PHONEME_ID(PH_CHOICE_BLEND)] = 25, + [PHONEME_ID(PH_CHOICE_HELD)] = 39, + [PHONEME_ID(PH_CHOICE_SOLO)] = 19, + [PHONEME_ID(PH_MOUTH_BLEND)] = 16, + [PHONEME_ID(PH_MOUTH_HELD)] = 54, + [PHONEME_ID(PH_MOUTH_SOLO)] = 18, + [PHONEME_ID(PH_FOOT_BLEND)] = 9, + [PHONEME_ID(PH_FOOT_HELD)] = 45, + [PHONEME_ID(PH_FOOT_SOLO)] = 15, + [PHONEME_ID(PH_GOOSE_BLEND)] = 12, + [PHONEME_ID(PH_GOOSE_HELD)] = 39, + [PHONEME_ID(PH_GOOSE_SOLO)] = 23, + [PHONEME_ID(PH_STRUT_BLEND)] = 5, + [PHONEME_ID(PH_STRUT_HELD)] = 45, + [PHONEME_ID(PH_STRUT_SOLO)] = 12, + [PHONEME_ID(PH_CURE_BLEND)] = 21, + [PHONEME_ID(PH_CURE_HELD)] = 48, + [PHONEME_ID(PH_CURE_SOLO)] = 12, + [PHONEME_ID(PH_NURSE_BLEND)] = 21, + [PHONEME_ID(PH_NURSE_HELD)] = 69, + [PHONEME_ID(PH_NURSE_SOLO)] = 18, + [NUM_PHONEME_SONGS] = 15, // This is the length that will be used by PREV_BARD_SOUND to hold the previous phoneme sound. +}; + +static s16 GetWordPitch(int tableIndex, int pitchIndex) { - return sBardSoundPitchTables[pitchIdx][songPos]; + return sPitchTables[tableIndex][pitchIndex]; } -const struct BardSound *GetWordSounds(u16 word) +const struct BardSoundTemplate *GetWordSoundTemplates(u16 easyChatWord) { u32 category; u32 subword; - const struct BardSound (*ptr)[6]; + const struct BardSoundTemplate (*ptr)[MAX_BARD_SOUNDS_PER_WORD]; - if (IsBardWordInvalid(word)) - { - return gBardSound_InvalidWord; - } - category = EC_GROUP(word); - subword = EC_INDEX(word); + if (IsBardWordInvalid(easyChatWord)) + return sEmptyPhonemeTemplate; + + category = EC_GROUP(easyChatWord); + subword = EC_INDEX(easyChatWord); switch (category) { case EC_GROUP_POKEMON: case EC_GROUP_POKEMON_NATIONAL: - ptr = gBardSounds_Pokemon; + ptr = sBardSoundTemplates_Pokemon; break; case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: - ptr = gBardSounds_Moves; + ptr = sBardSoundTemplates_Moves; break; default: - ptr = gBardSoundsTable[category]; + ptr = sBardSoundTemplatesTable[category]; break; } ptr += subword; return *ptr; } -void GetWordPhonemes(struct BardSong *song, u16 word) +// Assumes that 'soundTemplates' has already been loaded with the BardSoundTemplates for the easy chat word to calculate sounds for. +// 'pitchTableIndex' is chosen depending on the easy chat word, but is essentially an arbitrary value 0-4. +void CalcWordSounds(struct BardSong *song, u16 pitchTableIndex) { int i; - const struct BardSound *sound; + const struct BardSoundTemplate *template; song->length = 0; - for (i = 0; i < BARD_SOUND_MAX_LENGTH; i ++) + + for (i = 0; i < MAX_BARD_SOUNDS_PER_WORD; i ++) { - sound = &song->sound[i]; - if (sound->songLengthId != 0xFF) + template = &song->soundTemplates[i]; + if (template->songId != PHONEME_ID_NONE) { - song->phonemes[i].length = sound->songLengthOffset + gBardSoundLengthTable[sound->songLengthId]; - song->phonemes[i].pitch = CalcWordPitch(word + 30, i); - song->length += song->phonemes[i].length; + // Calculate the length and pitch of each phoneme in this word. + // A phoneme's length is always the same, and depends on the phoneme song and any adjustments in the template. + // Its pitch changes depending on the easy chat word and where in the list of templates the phoneme appears. + song->sounds[i].length = template->lengthAdjustment + sPhonemeLengths[template->songId]; + song->sounds[i].pitch = GetWordPitch(pitchTableIndex + BASE_PITCH_TABLE_INDEX, i); + + // Add this phoneme's length to the total sound length for this word. + song->length += song->sounds[i].length; } } - song->currPhoneme = 0; + song->soundIndex = 0; song->voiceInflection = 0; } diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c index ed18e89f9b..d26c6507e1 100644 --- a/src/battle_anim_fight.c +++ b/src/battle_anim_fight.c @@ -29,7 +29,7 @@ static void AnimArmThrustHit_Step(struct Sprite *sprite); static void AnimFocusPunchFist(struct Sprite *); static void AnimForcePalm(struct Sprite *sprite); -extern struct SpriteTemplate gBasicHitSplatSpriteTemplate; +extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; // Unused static const struct SpriteTemplate sUnusedHumanoidFootSpriteTemplate = diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index eacf2d3fb7..1e5996f780 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -843,7 +843,7 @@ void HandleInputChooseMove(u32 battler) TryChangeZTrigger(battler, gMoveSelectionCursor[battler]); } } - else if (JOY_NEW(SELECT_BUTTON) && !gBattleStruct->zmove.viewing && !gBattleStruct->descriptionSubmenu) + else if (B_MOVE_REARRANGEMENT_IN_BATTLE < GEN_4 && JOY_NEW(SELECT_BUTTON) && !gBattleStruct->zmove.viewing && !gBattleStruct->descriptionSubmenu) { if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { diff --git a/src/battle_message.c b/src/battle_message.c index a977bcd83c..fbc1f60353 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -628,7 +628,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_LASTABILITYRAISEDSTAT] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_LAST_ABILITY} raised its {B_BUFF1}!"), [STRINGID_MAGICBOUNCEACTIVATES] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} bounced the {B_ATK_NAME_WITH_PREFIX2} back!"), [STRINGID_PROTEANTYPECHANGE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY} transformed it into the {B_BUFF1} type!"), - [STRINGID_SYMBIOSISITEMPASS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} passed its {B_LAST_ITEM} to {B_ATK_NAME_WITH_PREFIX2} through {B_LAST_ABILITY}!"), + [STRINGID_SYMBIOSISITEMPASS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} passed its {B_LAST_ITEM} to {B_EFF_NAME_WITH_PREFIX2} through {B_LAST_ABILITY}!"), [STRINGID_STEALTHROCKDMG] = COMPOUND_STRING("Pointed stones dug into {B_SCR_NAME_WITH_PREFIX2}!"), [STRINGID_TOXICSPIKESABSORBED] = COMPOUND_STRING("The poison spikes disappeared from the ground around {B_ATK_TEAM2} team!"), [STRINGID_TOXICSPIKESPOISONED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} was poisoned!"), @@ -3150,7 +3150,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize) dst[dstID] = *src; dstID++; - BreakStringAutomatic(dst, BATTLE_MSG_MAX_WIDTH, BATTLE_MSG_MAX_WIDTH, fontId); + BreakStringAutomatic(dst, BATTLE_MSG_MAX_WIDTH, BATTLE_MSG_MAX_LINES, fontId); return dstID; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b4d668a0df..f88be3a36f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -16499,14 +16499,16 @@ void BS_GetBattlerSide(void) void BS_TrySymbiosis(void) { - NATIVE_ARGS(); + NATIVE_ARGS(u8 battler); + u32 battler = GetBattlerForBattleScript(cmd->battler); //called by Bestow, Fling, and Bug Bite, which don't work with Cmd_removeitem. - u32 partner = BATTLE_PARTNER(gBattlerAttacker); - if (SYMBIOSIS_CHECK(gBattlerAttacker, partner)) + u32 partner = BATTLE_PARTNER(battler); + if (SYMBIOSIS_CHECK(battler, partner)) { - BestowItem(partner, gBattlerAttacker); + BestowItem(partner, battler); gLastUsedAbility = gBattleMons[partner].ability; gBattleScripting.battler = gBattlerAbility = partner; + gEffectBattler = battler; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SymbiosisActivates; return; diff --git a/src/battle_util.c b/src/battle_util.c index fc916a76c4..19c9f5c4db 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3477,7 +3477,7 @@ static void CancellerParalysed(u32 *effect) { if (!gBattleStruct->isAtkCancelerForCalledMove && (gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) - && (GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD && B_MAGIC_GUARD >= GEN_4) + && !(B_MAGIC_GUARD == GEN_4 && GetBattlerAbility(gBattlerAttacker) == ABILITY_MAGIC_GUARD) && !RandomPercentage(RNG_PARALYSIS, 75)) { gProtectStructs[gBattlerAttacker].prlzImmobility = TRUE; @@ -10925,21 +10925,18 @@ bool32 DoesSpeciesUseHoldItemToChangeForm(u16 species, u16 heldItemId) u32 i; const struct FormChange *formChanges = GetSpeciesFormChanges(species); - if (formChanges != NULL) + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { - for (i = 0; formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) + switch (formChanges[i].method) { - switch (formChanges[i].method) - { - case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM: - case FORM_CHANGE_BATTLE_PRIMAL_REVERSION: - case FORM_CHANGE_BATTLE_ULTRA_BURST: - case FORM_CHANGE_ITEM_HOLD: - case FORM_CHANGE_BEGIN_BATTLE: - if (formChanges[i].param1 == heldItemId) - return TRUE; - break; - } + case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM: + case FORM_CHANGE_BATTLE_PRIMAL_REVERSION: + case FORM_CHANGE_BATTLE_ULTRA_BURST: + case FORM_CHANGE_ITEM_HOLD: + case FORM_CHANGE_BEGIN_BATTLE: + if (formChanges[i].param1 == heldItemId) + return TRUE; + break; } } return FALSE; @@ -11070,103 +11067,98 @@ u16 GetBattleFormChangeTargetSpecies(u32 battler, u16 method) u32 targetSpecies = species; const struct FormChange *formChanges = GetSpeciesFormChanges(species); struct Pokemon *mon = &GetBattlerParty(battler)[gBattlerPartyIndexes[battler]]; - u16 heldItem; + u16 heldItem = gBattleMons[battler].item; - if (formChanges != NULL) + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { - heldItem = gBattleMons[battler].item; - - for (i = 0; formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) + if (method == formChanges[i].method && species != formChanges[i].targetSpecies) { - if (method == formChanges[i].method && species != formChanges[i].targetSpecies) + switch (method) { - switch (method) + case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM: + case FORM_CHANGE_BATTLE_PRIMAL_REVERSION: + case FORM_CHANGE_BATTLE_ULTRA_BURST: + if (heldItem == formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_MOVE: + if (gBattleMons[battler].moves[0] == formChanges[i].param1 + || gBattleMons[battler].moves[1] == formChanges[i].param1 + || gBattleMons[battler].moves[2] == formChanges[i].param1 + || gBattleMons[battler].moves[3] == formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_SWITCH: + if (formChanges[i].param1 == GetBattlerAbility(battler) || formChanges[i].param1 == ABILITY_NONE) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_HP_PERCENT: + if (formChanges[i].param1 == GetBattlerAbility(battler)) { - case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM: - case FORM_CHANGE_BATTLE_PRIMAL_REVERSION: - case FORM_CHANGE_BATTLE_ULTRA_BURST: - if (heldItem == formChanges[i].param1) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_MEGA_EVOLUTION_MOVE: - if (gBattleMons[battler].moves[0] == formChanges[i].param1 - || gBattleMons[battler].moves[1] == formChanges[i].param1 - || gBattleMons[battler].moves[2] == formChanges[i].param1 - || gBattleMons[battler].moves[3] == formChanges[i].param1) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_SWITCH: - if (formChanges[i].param1 == GetBattlerAbility(battler) || formChanges[i].param1 == ABILITY_NONE) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_HP_PERCENT: - if (formChanges[i].param1 == GetBattlerAbility(battler)) + // We multiply by 100 to make sure that integer division doesn't mess with the health check. + u32 hpCheck = gBattleMons[battler].hp * 100 * 100 / gBattleMons[battler].maxHP; + switch(formChanges[i].param2) { - // We multiply by 100 to make sure that integer division doesn't mess with the health check. - u32 hpCheck = gBattleMons[battler].hp * 100 * 100 / gBattleMons[battler].maxHP; - switch(formChanges[i].param2) - { - case HP_HIGHER_THAN: - if (hpCheck > formChanges[i].param3 * 100) - targetSpecies = formChanges[i].targetSpecies; - break; - case HP_LOWER_EQ_THAN: - if (hpCheck <= formChanges[i].param3 * 100) - targetSpecies = formChanges[i].targetSpecies; - break; - } + case HP_HIGHER_THAN: + if (hpCheck > formChanges[i].param3 * 100) + targetSpecies = formChanges[i].targetSpecies; + break; + case HP_LOWER_EQ_THAN: + if (hpCheck <= formChanges[i].param3 * 100) + targetSpecies = formChanges[i].targetSpecies; + break; } - break; - case FORM_CHANGE_BATTLE_GIGANTAMAX: - if (GetMonData(mon, MON_DATA_GIGANTAMAX_FACTOR)) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_WEATHER: - // Check if there is a required ability and if the battler's ability does not match it - // or is suppressed. If so, revert to the no weather form. - if (formChanges[i].param2 - && GetBattlerAbility(battler) != formChanges[i].param2 - && formChanges[i].param1 == B_WEATHER_NONE) - { - targetSpecies = formChanges[i].targetSpecies; - } - // We need to revert the weather form if the field is under Air Lock, too. - else if (!WEATHER_HAS_EFFECT && formChanges[i].param1 == B_WEATHER_NONE) - { - targetSpecies = formChanges[i].targetSpecies; - } - // Otherwise, just check for a match between the weather and the form change table. - // Added a check for whether the weather is in effect to prevent end-of-turn soft locks with Cloud Nine / Air Lock - else if (((gBattleWeather & formChanges[i].param1) && WEATHER_HAS_EFFECT) - || (gBattleWeather == B_WEATHER_NONE && formChanges[i].param1 == B_WEATHER_NONE)) - { - targetSpecies = formChanges[i].targetSpecies; - } - break; - case FORM_CHANGE_BATTLE_TURN_END: - case FORM_CHANGE_HIT_BY_MOVE: - if (formChanges[i].param1 == GetBattlerAbility(battler)) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_STATUS: - if (gBattleMons[battler].status1 & formChanges[i].param1) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_TERASTALLIZATION: - if (GetBattlerTeraType(battler) == formChanges[i].param1) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_BEFORE_MOVE: - if (formChanges[i].param1 == gCurrentMove - && (formChanges[i].param2 == ABILITY_NONE || formChanges[i].param2 == GetBattlerAbility(battler))) - targetSpecies = formChanges[i].targetSpecies; - break; - case FORM_CHANGE_BATTLE_BEFORE_MOVE_CATEGORY: - if (formChanges[i].param1 == GetBattleMoveCategory(gCurrentMove) - && (formChanges[i].param2 == ABILITY_NONE || formChanges[i].param2 == GetBattlerAbility(battler))) - targetSpecies = formChanges[i].targetSpecies; - break; } + break; + case FORM_CHANGE_BATTLE_GIGANTAMAX: + if (GetMonData(mon, MON_DATA_GIGANTAMAX_FACTOR)) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_WEATHER: + // Check if there is a required ability and if the battler's ability does not match it + // or is suppressed. If so, revert to the no weather form. + if (formChanges[i].param2 + && GetBattlerAbility(battler) != formChanges[i].param2 + && formChanges[i].param1 == B_WEATHER_NONE) + { + targetSpecies = formChanges[i].targetSpecies; + } + // We need to revert the weather form if the field is under Air Lock, too. + else if (!WEATHER_HAS_EFFECT && formChanges[i].param1 == B_WEATHER_NONE) + { + targetSpecies = formChanges[i].targetSpecies; + } + // Otherwise, just check for a match between the weather and the form change table. + // Added a check for whether the weather is in effect to prevent end-of-turn soft locks with Cloud Nine / Air Lock + else if (((gBattleWeather & formChanges[i].param1) && WEATHER_HAS_EFFECT) + || (gBattleWeather == B_WEATHER_NONE && formChanges[i].param1 == B_WEATHER_NONE)) + { + targetSpecies = formChanges[i].targetSpecies; + } + break; + case FORM_CHANGE_BATTLE_TURN_END: + case FORM_CHANGE_HIT_BY_MOVE: + if (formChanges[i].param1 == GetBattlerAbility(battler)) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_STATUS: + if (gBattleMons[battler].status1 & formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_TERASTALLIZATION: + if (GetBattlerTeraType(battler) == formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_BEFORE_MOVE: + if (formChanges[i].param1 == gCurrentMove + && (formChanges[i].param2 == ABILITY_NONE || formChanges[i].param2 == GetBattlerAbility(battler))) + targetSpecies = formChanges[i].targetSpecies; + break; + case FORM_CHANGE_BATTLE_BEFORE_MOVE_CATEGORY: + if (formChanges[i].param1 == GetBattleMoveCategory(gCurrentMove) + && (formChanges[i].param2 == ABILITY_NONE || formChanges[i].param2 == GetBattlerAbility(battler))) + targetSpecies = formChanges[i].targetSpecies; + break; } } } diff --git a/src/contest.c b/src/contest.c index a1cd62777f..96bb4e925d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3269,16 +3269,19 @@ static u16 GetMoveEffectSymbolTileOffset(u16 move, u8 contestant) switch (gContestEffects[GetMoveContestEffect(move)].effectType) { - case 0: - case 1: - case 8: + case CONTEST_EFFECT_TYPE_APPEAL: + case CONTEST_EFFECT_TYPE_AVOID_STARTLE: + case CONTEST_EFFECT_TYPE_UNKNOWN: offset = 0x9082; break; - case 2: - case 3: + case CONTEST_EFFECT_TYPE_STARTLE_MON: + case CONTEST_EFFECT_TYPE_STARTLE_MONS: offset = 0x9088; break; default: + //case CONTEST_EFFECT_TYPE_WORSEN: + //case CONTEST_EFFECT_TYPE_SPECIAL_APPEAL: + //case CONTEST_EFFECT_TYPE_TURN_ORDER: offset = 0x9086; break; } diff --git a/src/data/bard_music/actions.h b/src/data/bard_music/actions.h index 5acac34502..de0f4c8fd3 100644 --- a/src/data/bard_music/actions.h +++ b/src/data/bard_music/actions.h @@ -1,626 +1,626 @@ #ifndef GUARD_DATA_BARD_MUSIC_ACTIONS_H #define GUARD_DATA_BARD_MUSIC_ACTIONS_H -const struct BardSound gBardSounds_Actions[][6] = { - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Actions[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_MEETS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CONCEDE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIVE)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIVES)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLAYED)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLAYS)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COLLECT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WALKING)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WALKS)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SAYS)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WENT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SAID)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAKE_UP)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAKES_UP)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ANGERS)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, + [EC_INDEX(EC_WORD_TEACH)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TEACHES)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLEASE)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEARN)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHANGE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STORY)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRUST)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LAVISH)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LISTENS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEARING)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRAINS)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHOOSE)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COME)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAME)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEARCH)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAKE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAUSE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KNOW)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KNOWS)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 47 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_REFUSE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STORES)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BRAG)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 26 }, - { .songLengthId = 2 }, + [EC_INDEX(EC_WORD_IGNORANT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THINKS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BELIEVE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SLIDE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EATS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 47 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_USE)] = { + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 47 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_USES)] = { + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 47 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_USING)] = { + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COULDN_T)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_CAPABLE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DISAPPEAR)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_APPEAR)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THROW)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORRY)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SLEPT)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SLEEP)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RELEASE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DRINKS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RUNS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RUN)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORKS)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORKING)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TALKING)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, + [EC_INDEX(EC_WORD_TALK)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SINK)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMACK)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PRETEND)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PRAISE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 41 }, + [EC_INDEX(EC_WORD_OVERDO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHOW)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOOKS)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEES)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEEK)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OWN)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TAKE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 35 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALLOW)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FORGET)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FORGETS)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_APPEARS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FAINT)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FAINTED)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/adjectives.h b/src/data/bard_music/adjectives.h index c86138d2c4..641fcb3f2e 100644 --- a/src/data/bard_music/adjectives.h +++ b/src/data/bard_music/adjectives.h @@ -1,293 +1,293 @@ #ifndef GUARD_DATA_BARD_MUSIC_ADJECTIVES_H #define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H -const struct BardSound gBardSounds_Adjectives[][6] = { - { - { .songLengthId = 29 }, - { .songLengthId = 50 }, - { .songLengthId = 12 }, +static const struct BardSoundTemplate sBardSoundTemplates_Adjectives[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_WANDERING)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_RICKETY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 27 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_ROCK_SOLID)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_HUNGRY)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TIGHT)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 36 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_TICKLISH)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TWIRLING)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 8 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SPIRALING)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THIRSTY)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOLLING)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SILKY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SADLY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOPELESS)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_USELESS)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DROOLING)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_EXCITING)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THICK)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMOOTH)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SLIMY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THIN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BREAK)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VORACIOUS)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SCATTER)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AWESOME)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WIMPY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WOBBLY)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHAKY)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RIPPED)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHREDDED)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_INCREASING)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YET)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 30 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DESTROYED)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 50 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_FIERY)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_LOVEY_DOVEY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_HAPPILY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 3 }, - { .songLengthId = 29 }, - { .songLengthId = 51 } + [EC_INDEX(EC_WORD_ANTICIPATION)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND } }; diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h deleted file mode 100644 index 291d22872a..0000000000 --- a/src/data/bard_music/bard_sounds.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef GUARD_BARD_SOUNDS_TABLE_H -#define GUARD_BARD_SOUNDS_TABLE_H - -#define NULL_BARD_SOUND { .songLengthId = 0xff } - -#include "pokemon.h" -#include "moves.h" -#include "trainer.h" -#include "status.h" -#include "battle.h" -#include "greetings.h" -#include "people.h" -#include "voices.h" -#include "speech.h" -#include "endings.h" -#include "feelings.h" -#include "conditions.h" -#include "actions.h" -#include "lifestyle.h" -#include "hobbies.h" -#include "time.h" -#include "misc.h" -#include "adjectives.h" -#include "events.h" -#include "trendysaying.h" - -const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { - [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon - [EC_GROUP_TRAINER] = gBardSounds_Trainer, - [EC_GROUP_STATUS] = gBardSounds_Status, - [EC_GROUP_BATTLE] = gBardSounds_Battle, - [EC_GROUP_GREETINGS] = gBardSounds_Greetings, - [EC_GROUP_PEOPLE] = gBardSounds_People, - [EC_GROUP_VOICES] = gBardSounds_Voices, - [EC_GROUP_SPEECH] = gBardSounds_Speech, - [EC_GROUP_ENDINGS] = gBardSounds_Endings, - [EC_GROUP_FEELINGS] = gBardSounds_Feelings, - [EC_GROUP_CONDITIONS] = gBardSounds_Conditions, - [EC_GROUP_ACTIONS] = gBardSounds_Actions, - [EC_GROUP_LIFESTYLE] = gBardSounds_Lifestyle, - [EC_GROUP_HOBBIES] = gBardSounds_Hobbies, - [EC_GROUP_TIME] = gBardSounds_Time, - [EC_GROUP_MISC] = gBardSounds_Misc, - [EC_GROUP_ADJECTIVES] = gBardSounds_Adjectives, - [EC_GROUP_EVENTS] = gBardSounds_Events, - [EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves - [EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves - [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying, - [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokemon -}; - -#endif //GUARD_BARD_SOUNDS_TABLE_H diff --git a/src/data/bard_music/battle.h b/src/data/bard_music/battle.h index c2cb57134f..0ec01b0322 100644 --- a/src/data/bard_music/battle.h +++ b/src/data/bard_music/battle.h @@ -1,506 +1,506 @@ #ifndef GUARD_DATA_BARD_MUSIC_BATTLE_H #define GUARD_DATA_BARD_MUSIC_BATTLE_H -const struct BardSound gBardSounds_Battle[][6] = { - { - { .songLengthId = 2 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Battle[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_MATCH_UP)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_NO_1)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DECIDE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 15 }, + [EC_INDEX(EC_WORD_LET_ME_WIN)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WINS)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WIN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WON)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 15 }, + [EC_INDEX(EC_WORD_IF_I_WIN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 15 }, + [EC_INDEX(EC_WORD_WHEN_I_WIN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAN_T_WIN)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAN_WIN)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NO_MATCH)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SPIRIT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_DECIDED)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 8 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRUMP_CARD)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TAKE_THAT)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COME_ON)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ATTACK)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 9 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_SURRENDER)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GUTSY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TALENT)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 11 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_STRATEGY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMITE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MATCH)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 50 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_VICTORY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OFFENSIVE)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SENSE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VERSUS)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FIGHTS)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 35 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_POWER)] = { + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHALLENGE)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STRONG)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOO_STRONG)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_GO_EASY)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FOE)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_GENIUS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEGEND)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ESCAPE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AIM)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BATTLE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FIGHT)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_RESUSCITATE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 30 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_POINTS)] = { + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_SERIOUS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIVE_UP)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOSS)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_IF_I_LOSE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 22 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOST)] = { + { .songId = PHONEME_ID(PH_LOT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOSE)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GUARD)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PARTNER)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_REJECT)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ACCEPT)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 36 }, + [EC_INDEX(EC_WORD_INVINCIBLE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RECEIVED)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EASY)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WEAK)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOO_WEAK)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 26 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_PUSHOVER)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEADER)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RULE)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MOVE)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/conditions.h b/src/data/bard_music/conditions.h index c56421e63f..9eb8b7f01c 100644 --- a/src/data/bard_music/conditions.h +++ b/src/data/bard_music/conditions.h @@ -1,554 +1,554 @@ #ifndef GUARD_DATA_BARD_MUSIC_CONDITIONS_H #define GUARD_DATA_BARD_MUSIC_CONDITIONS_H -const struct BardSound gBardSounds_Conditions[][6] = { - { - { .songLengthId = 21 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +const struct BardSoundTemplate sBardSoundTemplates_Conditions[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_HOT)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EXISTS)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EXCESS)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 41 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_APPROVED)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAS)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOOD)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LESS)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MOMENTUM)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOING)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WEIRD)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BUSY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 10 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_TOGETHER)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FULL)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ABSENT)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEING)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEED)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TASTY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SKILLED)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 32 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NOISY)] = { + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BIG)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LATE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 25 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CLOSE)] = { + { .songId = PHONEME_ID(PH_GOAT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DOCILE)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 39 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_AMUSING)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ENTERTAINING)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PERFECTION)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PRETTY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEALTHY)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_EXCELLENT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 20 }, - { .songLengthId = 35 }, + [EC_INDEX(EC_WORD_UPSIDE_DOWN)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COLD)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 10 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_REFRESHING)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 42 }, - { .songLengthId = 30 }, - { .songLengthId = 44 }, - { .songLengthId = 38 }, + [EC_INDEX(EC_WORD_UNAVOIDABLE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MUCH)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 50 }, - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OVERWHELMING)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_FABULOUS)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ELSE)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 10 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_EXPENSIVE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CORRECT)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 29 }, - { .songLengthId = 42 }, - { .songLengthId = 38 }, + [EC_INDEX(EC_WORD_IMPOSSIBLE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMALL)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_DIFFERENT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TIRED)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SKILL)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOP)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 22 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NON_STOP)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 22 }, - { .songLengthId = 50 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PREPOSTEROUS)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_HELD) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NONE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NOTHING)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 50 }, - { .songLengthId = 38 }, + [EC_INDEX(EC_WORD_NATURAL)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BECOMES)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 28 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LUKEWARM)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FAST)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOW)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AWFUL)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALONE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BORED)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SECRET)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_MYSTERY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LACKS)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEST)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOUSY)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MISTAKE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KIND)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WELL)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_WEAKENED)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SIMPLE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEEMS)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BADLY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/default_sound.h b/src/data/bard_music/default_sound.h deleted file mode 100644 index ad4008e16e..0000000000 --- a/src/data/bard_music/default_sound.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GUARD_default_sound_H -#define GUARD_default_sound_H - -const struct BardSound gBardSound_InvalidWord[] = { - NULL_BARD_SOUND, - NULL_BARD_SOUND, - NULL_BARD_SOUND, - NULL_BARD_SOUND, - NULL_BARD_SOUND, - NULL_BARD_SOUND -}; - -#endif //GUARD_default_sound_H diff --git a/src/data/bard_music/endings.h b/src/data/bard_music/endings.h index 2513476595..6d0669feed 100644 --- a/src/data/bard_music/endings.h +++ b/src/data/bard_music/endings.h @@ -1,554 +1,554 @@ #ifndef GUARD_DATA_BARD_MUSIC_ENDINGS_H #define GUARD_DATA_BARD_MUSIC_ENDINGS_H -const struct BardSound gBardSounds_Endings[][6] = { - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Endings[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_WILL)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_WILL_BE_HERE)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OR)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TIMES)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WONDER)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IS_IT_QUES)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BE)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIMME)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COULD)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 14 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIKELY_TO)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WOULD)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IS)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_ISN_T_IT_QUES)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_LET_S)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OTHER)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ARE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WERE)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THOSE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ISN_T)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WON_T)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAN_T)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CAN)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DON_T)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_DO)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DOES)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHOM)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHICH)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WASN_T)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WEREN_T)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAVE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAVEN_T)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_A)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AN)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NOT)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THERE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OK_QUES)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SO)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAYBE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 35 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ABOUT)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OVER)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALL)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FOR)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ON)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, + [EC_INDEX(EC_WORD_OFF)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AS)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WITH)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BETTER)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVER)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SINCE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OF)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BELONGS_TO)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AT)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, + [EC_INDEX(EC_WORD_OUT)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOO)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIKE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DID)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DIDN_T)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DOESN_T)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 35 }, + [EC_INDEX(EC_WORD_WITHOUT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AFTER)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEFORE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHILE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THAN)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ONCE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ANYWHERE)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/events.h b/src/data/bard_music/events.h index b33c1e2b30..6bd57c0c70 100644 --- a/src/data/bard_music/events.h +++ b/src/data/bard_music/events.h @@ -1,234 +1,234 @@ #ifndef GUARD_DATA_BARD_MUSIC_EVENTS_H #define GUARD_DATA_BARD_MUSIC_EVENTS_H -const struct BardSound gBardSounds_Events[][6] = { - { - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Events[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_APPEAL)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVENTS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STAY_AT_HOME)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BERRY)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CONTEST)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MC)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_JUDGE)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SUPER)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STAGE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 44 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HALL_OF_FAME)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVOLUTION)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HYPER)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 44 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_BATTLE_TOWER)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEADERS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_BATTLE_ROOM)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIDDEN)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SECRET_BASE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BLEND)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_POKEBLOCK)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MASTER)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RANK)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RIBBON)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 42 }, + [EC_INDEX(EC_WORD_CRUSH)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 9 }, + [EC_INDEX(EC_WORD_DIRECT)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_TOWER)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 42 }, + [EC_INDEX(EC_WORD_UNION)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ROOM)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WIRELESS)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_FRONTIER)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/feelings.h b/src/data/bard_music/feelings.h index a465133970..34ef734ecb 100644 --- a/src/data/bard_music/feelings.h +++ b/src/data/bard_music/feelings.h @@ -1,555 +1,555 @@ #ifndef GUARD_DATA_BARD_MUSIC_FEELINGS_H #define GUARD_DATA_BARD_MUSIC_FEELINGS_H -const struct BardSound gBardSounds_Feelings[][6] = { - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Feelings[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_MEET)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLAY)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HURRIED)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 25 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOES)] = { + { .songId = PHONEME_ID(PH_GOAT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIDDY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAPPY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_HAPPINESS)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EXCITE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 26 }, - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_IMPORTANT)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FUNNY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOT)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GO_HOME)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 30 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_DISAPPOINTED)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 32 }, + [EC_INDEX(EC_WORD_DISAPPOINTS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SAD)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRIES)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEARS)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THINK)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEAR)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, + [EC_INDEX(EC_WORD_WANTS)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MISHEARD)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DISLIKE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ANGRY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ANGER)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SCARY)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LONESOME)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 32 }, + [EC_INDEX(EC_WORD_DISAPPOINT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 32 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_JOY)] = { + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GETS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEVER)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DARN)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DOWNCAST)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 38 }, + [EC_INDEX(EC_WORD_INCREDIBLE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIKES)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DISLIKES)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BORING)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CARE)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CARES)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALL_RIGHT)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ADORE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_DISASTER)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 32 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ENJOY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 32 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ENJOYS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EAT)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LACKING)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BAD)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HARD)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 42 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_TERRIBLE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHOULD)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NICE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DRINK)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SURPRISE)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FEAR)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WANT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAIT)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SATISFIED)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RARE)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_NEGATIVE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DONE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DANGER)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 14 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_DEFEATED)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEAT)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GREAT)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 0 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_ROMANTIC)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_QUESTION)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 2 }, + [EC_INDEX(EC_WORD_UNDERSTAND)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UNDERSTANDS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, } diff --git a/src/data/bard_music/greetings.h b/src/data/bard_music/greetings.h index ebddb79de4..4a64c7d006 100644 --- a/src/data/bard_music/greetings.h +++ b/src/data/bard_music/greetings.h @@ -1,338 +1,338 @@ #ifndef GUARD_DATA_BARD_MUSIC_GREETINGS_H #define GUARD_DATA_BARD_MUSIC_GREETINGS_H -const struct BardSound gBardSounds_Greetings[][6] = { - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Greetings[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_THANKS)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YES)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HERE_GOES)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 18 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HERE_I_COME)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_HERE_IT_IS)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YEAH)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WELCOME)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 30 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OI)] = { + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOW_DO)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CONGRATS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIVE_ME)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SORRY)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 6 }, - { .songLengthId = 23 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_APOLOGIZE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FORGIVE)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEY_THERE)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HELLO)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOOD_BYE)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THANK_YOU)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 6 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_I_VE_ARRIVED)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PARDON)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EXCUSE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SEE_YA)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 40 }, - { .songLengthId = 13 }, + [EC_INDEX(EC_WORD_EXCUSE_ME)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WELL_THEN)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_GO_AHEAD)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_APPRECIATE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEY_QUES)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 43 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHAT_S_UP_QUES)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HUH_QUES)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HI)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YEAH_YEAH)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BYE_BYE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MEET_YOU)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMELL)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 11 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_LISTENING)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOO_HAH)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YAHOO)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 24 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_COME_OVER)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 35 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COUNT_ON)] = { + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/hobbies.h b/src/data/bard_music/hobbies.h index db55ef1246..d51e9164cf 100644 --- a/src/data/bard_music/hobbies.h +++ b/src/data/bard_music/hobbies.h @@ -1,434 +1,434 @@ #ifndef GUARD_DATA_BARD_MUSIC_HOBBIES_H #define GUARD_DATA_BARD_MUSIC_HOBBIES_H -const struct BardSound gBardSounds_Hobbies[][6] = { - { - { .songLengthId = 20 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Hobbies[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_IDOL)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_ANIME)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SONG)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MOVIE)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SWEETS)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHAT)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 38 }, - { .songLengthId = 4 }, + [EC_INDEX(EC_WORD_CHILD_S_PLAY)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 30 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOYS)] = { + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 47 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MUSIC)] = { + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CARDS)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHOPPING)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 50 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_CAMERA)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 47 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VIEWING)] = { + { .songId = PHONEME_ID(PH_CURE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 5 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_SPECTATOR)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOURMET)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GAME)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_RPG)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COLLECTION)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COMPLETE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAGAZINE)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WALK)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BIKE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOBBY)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SPORTS)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOFTWARE)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SONGS)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DIET)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TREASURE)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRAVEL)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DANCE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHANNEL)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAKING)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FISHING)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DATE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DESIGN)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_LOCOMOTIVE)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLUSH_DOLL)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PC)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FLOWERS)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HERO)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NAP)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 26 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEROINE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FASHION)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 11 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_ADVENTURE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BOARD)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BALL)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BOOK)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 14 }, - { .songLengthId = 8 }, + [EC_INDEX(EC_WORD_FESTIVAL)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COMICS)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 17 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_HOLIDAY)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLANS)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRENDY)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 5 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VACATION)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOOK)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/length_table.h b/src/data/bard_music/length_table.h deleted file mode 100644 index d53dcb23fa..0000000000 --- a/src/data/bard_music/length_table.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef GUARD_LENGTH_TABLE_H -#define GUARD_LENGTH_TABLE_H - -const int gBardSoundLengthTable[] = { - 9, 22, 15, 16, - 39, 21, 9, 30, - 24, 15, 25, 12, - 22, 45, 24, 15, - 40, 9, 21, 42, - 18, 9, 22, 15, - 27, 48, 18, 27, - 33, 24, 25, 39, - 19, 16, 54, 18, - 9, 45, 15, 12, - 39, 23, 5, 45, - 12, 21, 48, 12, - 21, 69, 18, 15 -}; - - -#endif //GUARD_LENGTH_TABLE_H diff --git a/src/data/bard_music/lifestyle.h b/src/data/bard_music/lifestyle.h index 9aeac37576..4415ab638a 100644 --- a/src/data/bard_music/lifestyle.h +++ b/src/data/bard_music/lifestyle.h @@ -1,362 +1,362 @@ #ifndef GUARD_DATA_BARD_MUSIC_LIFESTYLE_H #define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H -const struct BardSound gBardSounds_Lifestyle[][6] = { - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Lifestyle[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_CHORES)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOME)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MONEY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 35 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALLOWANCE)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BATH)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 50 }, - { .songLengthId = 3 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CONVERSATION)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SCHOOL)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_COMMEMORATE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HABIT)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GROUP)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORD)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STORE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SERVICE)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORK)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SYSTEM)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRAIN)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CLASS)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LESSONS)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 48 }, - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_INFORMATION)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIVING)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TEACHER)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 42 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_TOURNAMENT)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LETTER)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVENT)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_DIGITAL)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TEST)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 11 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_DEPT_STORE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TELEVISION)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PHONE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ITEM)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NAME)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEWS)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 39 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_POPULAR)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PARTY)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STUDY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MACHINE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAIL)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MESSAGE)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PROMISE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DREAM)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 50 }, - { .songLengthId = 23 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KINDERGARTEN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIFE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_RADIO)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RENTAL)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WORLD)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/misc.h b/src/data/bard_music/misc.h index 1bce1a45dd..730ff37d71 100644 --- a/src/data/bard_music/misc.h +++ b/src/data/bard_music/misc.h @@ -1,338 +1,338 @@ #ifndef GUARD_DATA_BARD_MUSIC_MISC_H #define GUARD_DATA_BARD_MUSIC_MISC_H -const struct BardSound gBardSounds_Misc[][6] = { - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Misc[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_HIGHS)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOWS)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UM)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_REAR)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THINGS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THING)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BELOW)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ABOVE)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BACK)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIGH)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HERE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_INSIDE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OUTSIDE)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BESIDE)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_THIS_IS_IT_EXCL)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THIS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_EVERY)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THESE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THESE_WERE)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DOWN)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THAT)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THOSE_ARE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THOSE_WERE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THAT_S_IT_EXCL)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AM)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THAT_WAS)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FRONT)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UP)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHOICE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FAR)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AWAY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEAR)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHERE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHEN)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHAT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DEEP)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHALLOW)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHY)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 46 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CONFUSED)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_CURE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 26 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_OPPOSITE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEFT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RIGHT)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h index ce6713c346..dc51f24413 100644 --- a/src/data/bard_music/moves.h +++ b/src/data/bard_music/moves.h @@ -5,7 +5,7 @@ const u16 gNumBardWords_Moves = MOVES_COUNT; -const struct BardSound gBardSounds_Moves[MOVES_COUNT][BARD_SOUND_MAX_LENGTH] = { +static const struct BardSoundTemplate sBardSoundTemplates_Moves[MOVES_COUNT][MAX_BARD_SOUNDS_PER_WORD] = { [MOVE_NONE] = { NULL_BARD_SOUND, NULL_BARD_SOUND, @@ -15,2311 +15,2311 @@ const struct BardSound gBardSounds_Moves[MOVES_COUNT][BARD_SOUND_MAX_LENGTH] = { NULL_BARD_SOUND, }, [MOVE_POUND] = { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_KARATE_CHOP] = { - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 14 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DOUBLE_SLAP] = { - { .songLengthId = 42 }, - { .songLengthId = 10 }, - { .songLengthId = 2 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_COMET_PUNCH] = { - { .songLengthId = 29 }, - { .songLengthId = 11 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEGA_PUNCH] = { - { .songLengthId = 3 }, - { .songLengthId = 42 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PAY_DAY] = { - { .songLengthId = 5 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FIRE_PUNCH] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ICE_PUNCH] = { - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 14 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THUNDER_PUNCH] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SCRATCH] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_VISE_GRIP] = { - { .songLengthId = 20 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GUILLOTINE] = { - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RAZOR_WIND] = { - { .songLengthId = 5 }, - { .songLengthId = 48 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWORDS_DANCE] = { - { .songLengthId = 26 }, - { .songLengthId = 48 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CUT] = { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GUST] = { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WING_ATTACK] = { - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WHIRLWIND] = { - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 14 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLY] = { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BIND] = { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLAM] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_VINE_WHIP] = { - { .songLengthId = 18 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STOMP] = { - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DOUBLE_KICK] = { - { .songLengthId = 42 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEGA_KICK] = { - { .songLengthId = 3 }, - { .songLengthId = 42 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_JUMP_KICK] = { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROLLING_KICK] = { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SAND_ATTACK] = { - { .songLengthId = 0 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HEADBUTT] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HORN_ATTACK] = { - { .songLengthId = 24 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FURY_ATTACK] = { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 2 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HORN_DRILL] = { - { .songLengthId = 24 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TACKLE] = { - { .songLengthId = 0 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BODY_SLAM] = { - { .songLengthId = 29 }, - { .songLengthId = 12 }, - { .songLengthId = 2 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WRAP] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TAKE_DOWN] = { - { .songLengthId = 3 }, - { .songLengthId = 35 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THRASH] = { - { .songLengthId = 48 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DOUBLE_EDGE] = { - { .songLengthId = 44 }, - { .songLengthId = 36 }, - { .songLengthId = 10 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TAIL_WHIP] = { - { .songLengthId = 5 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POISON_STING] = { - { .songLengthId = 30 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TWINEEDLE] = { - { .songLengthId = 15 }, - { .songLengthId = 12 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PIN_MISSILE] = { - { .songLengthId = 15 }, - { .songLengthId = 17 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LEER] = { - { .songLengthId = 14 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BITE] = { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GROWL] = { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROAR] = { - { .songLengthId = 26 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SING] = { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUPERSONIC] = { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 27 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SONIC_BOOM] = { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DISABLE] = { - { .songLengthId = 17 }, - { .songLengthId = 3 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ACID] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EMBER] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLAMETHROWER] = { - { .songLengthId = 0 }, - { .songLengthId = 26 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIST] = { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WATER_GUN] = { - { .songLengthId = 29 }, - { .songLengthId = 50 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYDRO_PUMP] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SURF] = { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ICE_BEAM] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BLIZZARD] = { - { .songLengthId = 15 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PSYBEAM] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BUBBLE_BEAM] = { - { .songLengthId = 42 }, - { .songLengthId = 36 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AURORA_BEAM] = { - { .songLengthId = 27 }, - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYPER_BEAM] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PECK] = { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DRILL_PECK] = { - { .songLengthId = 17 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUBMISSION] = { - { .songLengthId = 42 }, - { .songLengthId = 17 }, - { .songLengthId = 11 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LOW_KICK] = { - { .songLengthId = 24 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_COUNTER] = { - { .songLengthId = 33 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SEISMIC_TOSS] = { - { .songLengthId = 18 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STRENGTH] = { - { .songLengthId = 50 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ABSORB] = { - { .songLengthId = 42 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEGA_DRAIN] = { - { .songLengthId = 3 }, - { .songLengthId = 44 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LEECH_SEED] = { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GROWTH] = { - { .songLengthId = 48 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RAZOR_LEAF] = { - { .songLengthId = 5 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SOLAR_BEAM] = { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POISON_POWDER] = { - { .songLengthId = 30 }, - { .songLengthId = 44 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STUN_SPORE] = { - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLEEP_POWDER] = { - { .songLengthId = 12 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PETAL_DANCE] = { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STRING_SHOT] = { - { .songLengthId = 50 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DRAGON_RAGE] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FIRE_SPIN] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THUNDER_SHOCK] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THUNDERBOLT] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 26 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THUNDER_WAVE] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THUNDER] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROCK_THROW] = { - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EARTHQUAKE] = { - { .songLengthId = 48 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FISSURE] = { - { .songLengthId = 17 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DIG] = { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TOXIC] = { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CONFUSION] = { - { .songLengthId = 44 }, - { .songLengthId = 41 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PSYCHIC] = { - { .songLengthId = 18 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYPNOSIS] = { - { .songLengthId = 17 }, - { .songLengthId = 24 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEDITATE] = { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AGILITY] = { - { .songLengthId = 42 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 14 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_QUICK_ATTACK] = { - { .songLengthId = 39 }, - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RAGE] = { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TELEPORT] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_NIGHT_SHADE] = { - { .songLengthId = 18 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIMIC] = { - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SCREECH] = { - { .songLengthId = 48 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DOUBLE_TEAM] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RECOVER] = { - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HARDEN] = { - { .songLengthId = 27 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MINIMIZE] = { - { .songLengthId = 15 }, - { .songLengthId = 15 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SMOKESCREEN] = { - { .songLengthId = 26 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CONFUSE_RAY] = { - { .songLengthId = 27 }, - { .songLengthId = 45 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WITHDRAW] = { - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DEFENSE_CURL] = { - { .songLengthId = 14 }, - { .songLengthId = 11 }, - { .songLengthId = 50 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BARRIER] = { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LIGHT_SCREEN] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HAZE] = { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_REFLECT] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FOCUS_ENERGY] = { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, }, [MOVE_BIDE] = { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_METRONOME] = { - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIRROR_MOVE] = { - { .songLengthId = 12 }, - { .songLengthId = 50 }, - { .songLengthId = 41 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SELF_DESTRUCT] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EGG_BOMB] = { - { .songLengthId = 9 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LICK] = { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SMOG] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLUDGE] = { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BONE_CLUB] = { - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FIRE_BLAST] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WATERFALL] = { - { .songLengthId = 29 }, - { .songLengthId = 48 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CLAMP] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWIFT] = { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SKULL_BASH] = { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPIKE_CANNON] = { - { .songLengthId = 20 }, - { .songLengthId = 0 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CONSTRICT] = { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AMNESIA] = { - { .songLengthId = 2 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_KINESIS] = { - { .songLengthId = 15 }, - { .songLengthId = 12 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SOFT_BOILED] = { - { .songLengthId = 27 }, - { .songLengthId = 30 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HIGH_JUMP_KICK] = { - { .songLengthId = 18 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GLARE] = { - { .songLengthId = 5 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DREAM_EATER] = { - { .songLengthId = 14 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POISON_GAS] = { - { .songLengthId = 30 }, - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BARRAGE] = { - { .songLengthId = 48 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LEECH_LIFE] = { - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LOVELY_KISS] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SKY_ATTACK] = { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TRANSFORM] = { - { .songLengthId = 0 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BUBBLE] = { - { .songLengthId = 44 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DIZZY_PUNCH] = { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPORE] = { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLASH] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PSYWAVE] = { - { .songLengthId = 18 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPLASH] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ACID_ARMOR] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CRABHAMMER] = { - { .songLengthId = 2 }, - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EXPLOSION] = { - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FURY_SWIPES] = { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BONEMERANG] = { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_REST] = { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROCK_SLIDE] = { - { .songLengthId = 27 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYPER_FANG] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SHARPEN] = { - { .songLengthId = 27 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CONVERSION] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TRI_ATTACK] = { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUPER_FANG] = { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLASH] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUBSTITUTE] = { - { .songLengthId = 42 }, - { .songLengthId = 17 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STRUGGLE] = { - { .songLengthId = 42 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SKETCH] = { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TRIPLE_KICK] = { - { .songLengthId = 17 }, - { .songLengthId = 36 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_THIEF] = { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPIDER_WEB] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 9 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIND_READER] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_NIGHTMARE] = { - { .songLengthId = 18 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLAME_WHEEL] = { - { .songLengthId = 3 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SNORE] = { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CURSE] = { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLAIL] = { - { .songLengthId = 5 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CONVERSION_2] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AEROBLAST] = { - { .songLengthId = 5 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_COTTON_SPORE] = { - { .songLengthId = 29 }, - { .songLengthId = 29 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_REVERSAL] = { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPITE] = { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POWDER_SNOW] = { - { .songLengthId = 33 }, - { .songLengthId = 48 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PROTECT] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MACH_PUNCH] = { - { .songLengthId = 27 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SCARY_FACE] = { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 3 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FEINT_ATTACK] = { - { .songLengthId = 3 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWEET_KISS] = { - { .songLengthId = 14 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BELLY_DRUM] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLUDGE_BOMB] = { - { .songLengthId = 43 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MUD_SLAP] = { - { .songLengthId = 44 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_OCTAZOOKA] = { - { .songLengthId = 27 }, - { .songLengthId = 44 }, - { .songLengthId = 40 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPIKES] = { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ZAP_CANNON] = { - { .songLengthId = 0 }, - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FORESIGHT] = { - { .songLengthId = 26 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DESTINY_BOND] = { - { .songLengthId = 9 }, - { .songLengthId = 15 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PERISH_SONG] = { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ICY_WIND] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 15 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DETECT] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BONE_RUSH] = { - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LOCK_ON] = { - { .songLengthId = 27 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_OUTRAGE] = { - { .songLengthId = 33 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SANDSTORM] = { - { .songLengthId = 0 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GIGA_DRAIN] = { - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ENDURE] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CHARM] = { - { .songLengthId = 21 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROLLOUT] = { - { .songLengthId = 26 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FALSE_SWIPE] = { - { .songLengthId = 27 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWAGGER] = { - { .songLengthId = 2 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MILK_DRINK] = { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPARK] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FURY_CUTTER] = { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STEEL_WING] = { - { .songLengthId = 14 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEAN_LOOK] = { - { .songLengthId = 12 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ATTRACT] = { - { .songLengthId = 42 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLEEP_TALK] = { - { .songLengthId = 14 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HEAL_BELL] = { - { .songLengthId = 14 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RETURN] = { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PRESENT] = { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FRUSTRATION] = { - { .songLengthId = 44 }, - { .songLengthId = 3 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SAFEGUARD] = { - { .songLengthId = 3 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PAIN_SPLIT] = { - { .songLengthId = 3 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SACRED_FIRE] = { - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MAGNITUDE] = { - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DYNAMIC_PUNCH] = { - { .songLengthId = 18 }, - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEGAHORN] = { - { .songLengthId = 3 }, - { .songLengthId = 42 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DRAGON_BREATH] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BATON_PASS] = { - { .songLengthId = 42 }, - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ENCORE] = { - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PURSUIT] = { - { .songLengthId = 48 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RAPID_SPIN] = { - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 15 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWEET_SCENT] = { - { .songLengthId = 14 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_IRON_TAIL] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_METAL_CLAW] = { - { .songLengthId = 9 }, - { .songLengthId = 36 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_VITAL_THROW] = { - { .songLengthId = 18 }, - { .songLengthId = 36 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MORNING_SUN] = { - { .songLengthId = 26 }, - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SYNTHESIS] = { - { .songLengthId = 15 }, - { .songLengthId = 42 }, - { .songLengthId = 15 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MOONLIGHT] = { - { .songLengthId = 39 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HIDDEN_POWER] = { - { .songLengthId = 15 }, - { .songLengthId = 9 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CROSS_CHOP] = { - { .songLengthId = 27 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TWISTER] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RAIN_DANCE] = { - { .songLengthId = 3 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUNNY_DAY] = { - { .songLengthId = 42 }, - { .songLengthId = 14 }, - { .songLengthId = 5 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CRUNCH] = { - { .songLengthId = 48 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIRROR_COAT] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_PSYCH_UP] = { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EXTREME_SPEED] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ANCIENT_POWER] = { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 33 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SHADOW_BALL] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FUTURE_SIGHT] = { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROCK_SMASH] = { - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WHIRLPOOL] = { - { .songLengthId = 48 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BEAT_UP] = { - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FAKE_OUT] = { - { .songLengthId = 3 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_UPROAR] = { - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_STOCKPILE] = { - { .songLengthId = 27 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SPIT_UP] = { - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SWALLOW] = { - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HEAT_WAVE] = { - { .songLengthId = 12 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HAIL] = { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TORMENT] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FLATTER] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WILL_O_WISP] = { - { .songLengthId = 17 }, - { .songLengthId = 24 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MEMENTO] = { - { .songLengthId = 42 }, - { .songLengthId = 9 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FACADE] = { - { .songLengthId = 44 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FOCUS_PUNCH] = { - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SMELLING_SALTS] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FOLLOW_ME] = { - { .songLengthId = 21 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_NATURE_POWER] = { - { .songLengthId = 3 }, - { .songLengthId = 48 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CHARGE] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TAUNT] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HELPING_HAND] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TRICK] = { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROLE_PLAY] = { - { .songLengthId = 24 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WISH] = { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ASSIST] = { - { .songLengthId = 42 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_INGRAIN] = { - { .songLengthId = 15 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SUPERPOWER] = { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MAGIC_COAT] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_RECYCLE] = { - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_REVENGE] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BRICK_BREAK] = { - { .songLengthId = 17 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_YAWN] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_KNOCK_OFF] = { - { .songLengthId = 27 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ENDEAVOR] = { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ERUPTION] = { - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SKILL_SWAP] = { - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_IMPRISON] = { - { .songLengthId = 15 }, - { .songLengthId = 15 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_REFRESH] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GRUDGE] = { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SNATCH] = { - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, @@ -2327,522 +2327,522 @@ const struct BardSound gBardSounds_Moves[MOVES_COUNT][BARD_SOUND_MAX_LENGTH] = { NULL_BARD_SOUND, }, [MOVE_SECRET_POWER] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DIVE] = { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ARM_THRUST] = { - { .songLengthId = 27 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CAMOUFLAGE] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TAIL_GLOW] = { - { .songLengthId = 4 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LUSTER_PURGE] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 50 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MIST_BALL] = { - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FEATHER_DANCE] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TEETER_DANCE] = { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BLAZE_KICK] = { - { .songLengthId = 5 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MUD_SPORT] = { - { .songLengthId = 42 }, - { .songLengthId = 24 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ICE_BALL] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_NEEDLE_ARM] = { - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SLACK_OFF] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYPER_VOICE] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 30 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POISON_FANG] = { - { .songLengthId = 30 }, - { .songLengthId = 42 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CRUSH_CLAW] = { - { .songLengthId = 44 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BLAST_BURN] = { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HYDRO_CANNON] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_METEOR_MASH] = { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, }, [MOVE_ASTONISH] = { - { .songLengthId = 42 }, - { .songLengthId = 27 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WEATHER_BALL] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AROMATHERAPY] = { - { .songLengthId = 42 }, - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 14 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, }, [MOVE_FAKE_TEARS] = { - { .songLengthId = 3 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AIR_CUTTER] = { - { .songLengthId = 5 }, - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_OVERHEAT] = { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ODOR_SLEUTH] = { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROCK_TOMB] = { - { .songLengthId = 27 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SILVER_WIND] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 15 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_METAL_SOUND] = { - { .songLengthId = 9 }, - { .songLengthId = 27 }, - { .songLengthId = 33 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_GRASS_WHISTLE] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_TICKLE] = { - { .songLengthId = 17 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_COSMIC_POWER] = { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WATER_SPOUT] = { - { .songLengthId = 27 }, - { .songLengthId = 48 }, - { .songLengthId = 33 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SIGNAL_BEAM] = { - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SHADOW_PUNCH] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_EXTRASENSORY] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, }, [MOVE_SKY_UPPERCUT] = { - { .songLengthId = 18 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SAND_TOMB] = { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SHEER_COLD] = { - { .songLengthId = 14 }, - { .songLengthId = 48 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MUDDY_WATER] = { - { .songLengthId = 42 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BULLET_SEED] = { - { .songLengthId = 42 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_AERIAL_ACE] = { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 3 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ICICLE_SPEAR] = { - { .songLengthId = 18 }, - { .songLengthId = 15 }, - { .songLengthId = 42 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, }, [MOVE_IRON_DEFENSE] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 9 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BLOCK] = { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_HOWL] = { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DRAGON_CLAW] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_FRENZY_PLANT] = { - { .songLengthId = 48 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BULK_UP] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_BOUNCE] = { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MUD_SHOT] = { - { .songLengthId = 44 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_POISON_TAIL] = { - { .songLengthId = 30 }, - { .songLengthId = 44 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_COVET] = { - { .songLengthId = 42 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_VOLT_TACKLE] = { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 0 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_MAGICAL_LEAF] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 36 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WATER_SPORT] = { - { .songLengthId = 27 }, - { .songLengthId = 48 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_CALM_MIND] = { - { .songLengthId = 27 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_LEAF_BLADE] = { - { .songLengthId = 12 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DRAGON_DANCE] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_ROCK_BLAST] = { - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_SHOCK_WAVE] = { - { .songLengthId = 27 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_WATER_PULSE] = { - { .songLengthId = 27 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [MOVE_DOOM_DESIRE] = { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, }, [MOVE_PSYCHO_BOOST] = { - { .songLengthId = 18 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, } diff --git a/src/data/bard_music/people.h b/src/data/bard_music/people.h index c1c2f9d3fe..6fbc39489d 100644 --- a/src/data/bard_music/people.h +++ b/src/data/bard_music/people.h @@ -1,602 +1,602 @@ #ifndef GUARD_DATA_BARD_MUSIC_PEOPLE_H #define GUARD_DATA_BARD_MUSIC_PEOPLE_H -const struct BardSound gBardSounds_People[][6] = { - { - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 11 }, +static const struct BardSoundTemplate sBardSoundTemplates_People[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_OPPONENT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 19 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_I)] = { + { .songId = PHONEME_ID(PH_PRICE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOU)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOURS)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SON)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26, .songLengthOffset = -0x9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOUR)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO), .lengthAdjustment = -9 }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOU_RE)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOU_VE)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MOTHER)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 8 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GRANDFATHER)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UNCLE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FATHER)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 30 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BOY)] = { + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ADULT)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BROTHER)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SISTER)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GRANDMOTHER)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 7 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AUNT)] = { + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PARENT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAN)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ME)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GIRL)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BABE)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_FAMILY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HER)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIM)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLACE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAUGHTER)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIS)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HE_S)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AREN_T)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SIBLINGS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KID)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHILDREN)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MR)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MRS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MYSELF)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_I_WAS)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO_ME)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_I_AM)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_I_VE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHO)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOMEONE)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHO_WAS)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 41 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO_WHOM)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHOSE)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHO_IS)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 16 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IT_S)] = { + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LADY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FRIEND)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALLY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PERSON)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 40 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DUDE)] = { + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THEY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THEY_WERE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO_THEM)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THEIR)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THEY_RE)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THEY_VE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEEN)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO_US)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OUR)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WE_RE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RIVAL)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WE_VE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 38 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WOMAN)] = { + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 43 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHE_WAS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TO_HER)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HERS)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHE_IS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOME)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h index 268127ffdd..cb672ac68a 100644 --- a/src/data/bard_music/pokemon.h +++ b/src/data/bard_music/pokemon.h @@ -3,7 +3,7 @@ const u16 gNumBardWords_Species = NUM_SPECIES; -const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][BARD_SOUND_MAX_LENGTH] = { +static const struct BardSoundTemplate sBardSoundTemplates_Pokemon[NUM_SPECIES][MAX_BARD_SOUNDS_PER_WORD] = { [SPECIES_NONE] = { NULL_BARD_SOUND, NULL_BARD_SOUND, @@ -13,1207 +13,1207 @@ const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][BARD_SOUND_MAX_LENGTH] = NULL_BARD_SOUND, }, [SPECIES_BULBASAUR] = { - { .songLengthId = 36 }, - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_IVYSAUR] = { - { .songLengthId = 20 }, - { .songLengthId = 12 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VENUSAUR] = { - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHARMANDER] = { - { .songLengthId = 6 }, - { .songLengthId = 2 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHARMELEON] = { - { .songLengthId = 6 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHARIZARD] = { - { .songLengthId = 6 }, - { .songLengthId = 17 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SQUIRTLE] = { - { .songLengthId = 48 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WARTORTLE] = { - { .songLengthId = 8 }, - { .songLengthId = 48 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BLASTOISE] = { - { .songLengthId = 0 }, - { .songLengthId = 30 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CATERPIE] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_METAPOD] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BUTTERFREE] = { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WEEDLE] = { - { .songLengthId = 14 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KAKUNA] = { - { .songLengthId = 42 }, - { .songLengthId = 39 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BEEDRILL] = { - { .songLengthId = 12 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PIDGEY] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PIDGEOTTO] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PIDGEOT] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RATTATA] = { - { .songLengthId = 0 }, - { .songLengthId = 0 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RATICATE] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 3 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SPEAROW] = { - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FEAROW] = { - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_EKANS] = { - { .songLengthId = 9 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARBOK] = { - { .songLengthId = 6 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PIKACHU] = { - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RAICHU] = { - { .songLengthId = 18 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SANDSHREW] = { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SANDSLASH] = { - { .songLengthId = 0 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDORAN_F] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDORINA] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDOQUEEN] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDORAN_M] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDORINO] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NIDOKING] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLEFAIRY] = { - { .songLengthId = 9 }, - { .songLengthId = 11 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLEFABLE] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 36 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VULPIX] = { - { .songLengthId = 36 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NINETALES] = { - { .songLengthId = 18 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_JIGGLYPUFF] = { - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WIGGLYTUFF] = { - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ZUBAT] = { - { .songLengthId = 39 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GOLBAT] = { - { .songLengthId = 26 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ODDISH] = { - { .songLengthId = 21 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GLOOM] = { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VILEPLUME] = { - { .songLengthId = 20 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PARAS] = { - { .songLengthId = 9 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PARASECT] = { - { .songLengthId = 9 }, - { .songLengthId = 0 }, - { .songLengthId = 9 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VENONAT] = { - { .songLengthId = 9 }, - { .songLengthId = 26 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VENOMOTH] = { - { .songLengthId = 9 }, - { .songLengthId = 26 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DIGLETT] = { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DUGTRIO] = { - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEOWTH] = { - { .songLengthId = 12 }, - { .songLengthId = 33 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PERSIAN] = { - { .songLengthId = 50 }, - { .songLengthId = 17 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PSYDUCK] = { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GOLDUCK] = { - { .songLengthId = 24 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MANKEY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PRIMEAPE] = { - { .songLengthId = 18 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GROWLITHE] = { - { .songLengthId = 33 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARCANINE] = { - { .songLengthId = 6 }, - { .songLengthId = 3 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_POLIWAG] = { - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_POLIWHIRL] = { - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_POLIWRATH] = { - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ABRA] = { - { .songLengthId = 0 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KADABRA] = { - { .songLengthId = 44 }, - { .songLengthId = 0 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ALAKAZAM] = { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MACHOP] = { - { .songLengthId = 42 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MACHOKE] = { - { .songLengthId = 42 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MACHAMP] = { - { .songLengthId = 42 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BELLSPROUT] = { - { .songLengthId = 11 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WEEPINBELL] = { - { .songLengthId = 12 }, - { .songLengthId = 15 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VICTREEBEL] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TENTACOOL] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TENTACRUEL] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GEODUDE] = { - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GRAVELER] = { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GOLEM] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PONYTA] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RAPIDASH] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLOWPOKE] = { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLOWBRO] = { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGNEMITE] = { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 18 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGNETON] = { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FARFETCHD] = { - { .songLengthId = 6 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DODUO] = { - { .songLengthId = 26 }, - { .songLengthId = 39 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DODRIO] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEEL] = { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DEWGONG] = { - { .songLengthId = 39 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GRIMER] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MUK] = { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHELLDER] = { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLOYSTER] = { - { .songLengthId = 30 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GASTLY] = { - { .songLengthId = 0 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HAUNTER] = { - { .songLengthId = 21 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GENGAR] = { - { .songLengthId = 9 }, - { .songLengthId = 8 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ONIX] = { - { .songLengthId = 21 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DROWZEE] = { - { .songLengthId = 33 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HYPNO] = { - { .songLengthId = 17 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KRABBY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KINGLER] = { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VOLTORB] = { - { .songLengthId = 26 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ELECTRODE] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_EXEGGCUTE] = { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_EXEGGUTOR] = { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 9 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CUBONE] = { - { .songLengthId = 45 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAROWAK] = { - { .songLengthId = 0 }, - { .songLengthId = 26 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HITMONLEE] = { - { .songLengthId = 17 }, - { .songLengthId = 21 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HITMONCHAN] = { - { .songLengthId = 17 }, - { .songLengthId = 21 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LICKITUNG] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KOFFING] = { - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WEEZING] = { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RHYHORN] = { - { .songLengthId = 20 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RHYDON] = { - { .songLengthId = 18 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHANSEY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TANGELA] = { - { .songLengthId = 2 }, - { .songLengthId = 9 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KANGASKHAN] = { - { .songLengthId = 0 }, - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HORSEA] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEADRA] = { - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GOLDEEN] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEAKING] = { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_STARYU] = { - { .songLengthId = 27 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_STARMIE] = { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MR_MIME] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 18 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SCYTHER] = { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_JYNX] = { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ELECTABUZZ] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGMAR] = { - { .songLengthId = 0 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PINSIR] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TAUROS] = { - { .songLengthId = 29 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGIKARP] = { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GYARADOS] = { - { .songLengthId = 29 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 29 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LAPRAS] = { - { .songLengthId = 44 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DITTO] = { - { .songLengthId = 17 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_EEVEE] = { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VAPOREON] = { - { .songLengthId = 3 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_JOLTEON] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FLAREON] = { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PORYGON] = { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 21 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_OMANYTE] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_OMASTAR] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KABUTO] = { - { .songLengthId = 42 }, - { .songLengthId = 39 }, - { .songLengthId = 26 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KABUTOPS] = { - { .songLengthId = 42 }, - { .songLengthId = 39 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AERODACTYL] = { - { .songLengthId = 3 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SNORLAX] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARTICUNO] = { - { .songLengthId = 6 }, - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ZAPDOS] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MOLTRES] = { - { .songLengthId = 26 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DRATINI] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DRAGONAIR] = { - { .songLengthId = 0 }, - { .songLengthId = 21 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DRAGONITE] = { - { .songLengthId = 0 }, - { .songLengthId = 21 }, - { .songLengthId = 18 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEWTWO] = { - { .songLengthId = 45 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEW] = { - { .songLengthId = 45 }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, @@ -1221,1882 +1221,1882 @@ const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][BARD_SOUND_MAX_LENGTH] = NULL_BARD_SOUND, }, [SPECIES_CHIKORITA] = { - { .songLengthId = 17 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BAYLEEF] = { - { .songLengthId = 3 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEGANIUM] = { - { .songLengthId = 3 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CYNDAQUIL] = { - { .songLengthId = 15 }, - { .songLengthId = 42 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_QUILAVA] = { - { .songLengthId = 17 }, - { .songLengthId = 6 }, - { .songLengthId = 8 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TYPHLOSION] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TOTODILE] = { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 18 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CROCONAW] = { - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FERALIGATR] = { - { .songLengthId = 48 }, - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 3 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, }, [SPECIES_SENTRET] = { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FURRET] = { - { .songLengthId = 48 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HOOTHOOT] = { - { .songLengthId = 39 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NOCTOWL] = { - { .songLengthId = 27 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LEDYBA] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LEDIAN] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SPINARAK] = { - { .songLengthId = 15 }, - { .songLengthId = 48 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARIADOS] = { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CROBAT] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHINCHOU] = { - { .songLengthId = 15 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LANTURN] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PICHU] = { - { .songLengthId = 12 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLEFFA] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_IGGLYBUFF] = { - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TOGEPI] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TOGETIC] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NATU] = { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_XATU] = { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAREEP] = { - { .songLengthId = 29 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FLAAFFY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AMPHAROS] = { - { .songLengthId = 0 }, - { .songLengthId = 6 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BELLOSSOM] = { - { .songLengthId = 9 }, - { .songLengthId = 27 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MARILL] = { - { .songLengthId = 8 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AZUMARILL] = { - { .songLengthId = 8 }, - { .songLengthId = 39 }, - { .songLengthId = 44 }, - { .songLengthId = 16 }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SUDOWOODO] = { - { .songLengthId = 39 }, - { .songLengthId = 24 }, - { .songLengthId = 39 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_POLITOED] = { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HOPPIP] = { - { .songLengthId = 29 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SKIPLOOM] = { - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_JUMPLUFF] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AIPOM] = { - { .songLengthId = 3 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SUNKERN] = { - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SUNFLORA] = { - { .songLengthId = 44 }, - { .songLengthId = 24 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_YANMA] = { - { .songLengthId = 0 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WOOPER] = { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_QUAGSIRE] = { - { .songLengthId = 0 }, - { .songLengthId = 18 }, - { .songLengthId = 50 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ESPEON] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_UMBREON] = { - { .songLengthId = 42 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MURKROW] = { - { .songLengthId = 48 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLOWKING] = { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MISDREAVUS] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_UNOWN] = { - { .songLengthId = 42 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WOBBUFFET] = { - { .songLengthId = 29 }, - { .songLengthId = 44 }, - { .songLengthId = 9 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GIRAFARIG] = { - { .songLengthId = 48 }, - { .songLengthId = 0 }, - { .songLengthId = 42 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PINECO] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FORRETRESS] = { - { .songLengthId = 26 }, - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DUNSPARCE] = { - { .songLengthId = 42 }, - { .songLengthId = 28 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GLIGAR] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_STEELIX] = { - { .songLengthId = 12 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SNUBBULL] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GRANBULL] = { - { .songLengthId = 2 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_QWILFISH] = { - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SCIZOR] = { - { .songLengthId = 17 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHUCKLE] = { - { .songLengthId = 42 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HERACROSS] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SNEASEL] = { - { .songLengthId = 12 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TEDDIURSA] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_URSARING] = { - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLUGMA] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGCARGO] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SWINUB] = { - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PILOSWINE] = { - { .songLengthId = 17 }, - { .songLengthId = 26 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CORSOLA] = { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_REMORAID] = { - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 3 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_OCTILLERY] = { - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DELIBIRD] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MANTINE] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SKARMORY] = { - { .songLengthId = 27 }, - { .songLengthId = 26 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HOUNDOUR] = { - { .songLengthId = 35 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HOUNDOOM] = { - { .songLengthId = 33 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KINGDRA] = { - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PHANPY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DONPHAN] = { - { .songLengthId = 27 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PORYGON2] = { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_STANTLER] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SMEARGLE] = { - { .songLengthId = 48 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TYROGUE] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HITMONTOP] = { - { .songLengthId = 17 }, - { .songLengthId = 21 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SMOOCHUM] = { - { .songLengthId = 39 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ELEKID] = { - { .songLengthId = 11 }, - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAGBY] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MILTANK] = { - { .songLengthId = 17 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BLISSEY] = { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RAIKOU] = { - { .songLengthId = 18 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ENTEI] = { - { .songLengthId = 9 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SUICUNE] = { - { .songLengthId = 12 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LARVITAR] = { - { .songLengthId = 21 }, - { .songLengthId = 17 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PUPITAR] = { - { .songLengthId = 39 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TYRANITAR] = { - { .songLengthId = 18 }, - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LUGIA] = { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HO_OH] = { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CELEBI] = { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TREECKO] = { - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GROVYLE] = { - { .songLengthId = 24 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SCEPTILE] = { - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TORCHIC] = { - { .songLengthId = 24 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_COMBUSKEN] = { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BLAZIKEN] = { - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MUDKIP] = { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MARSHTOMP] = { - { .songLengthId = 27 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SWAMPERT] = { - { .songLengthId = 27 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_POOCHYENA] = { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MIGHTYENA] = { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 44 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ZIGZAGOON] = { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 39 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LINOONE] = { - { .songLengthId = 20 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WURMPLE] = { - { .songLengthId = 48 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SILCOON] = { - { .songLengthId = 17 }, - { .songLengthId = 40 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BEAUTIFLY] = { - { .songLengthId = 45 }, - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CASCOON] = { - { .songLengthId = 0 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DUSTOX] = { - { .songLengthId = 44 }, - { .songLengthId = 23 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LOTAD] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LOMBRE] = { - { .songLengthId = 24 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LUDICOLO] = { - { .songLengthId = 39 }, - { .songLengthId = 9 }, - { .songLengthId = 26 }, - { .songLengthId = 26 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEEDOT] = { - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NUZLEAF] = { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHIFTRY] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NINCADA] = { - { .songLengthId = 15 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NINJASK] = { - { .songLengthId = 15 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHEDINJA] = { - { .songLengthId = 9 }, - { .songLengthId = 15 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TAILLOW] = { - { .songLengthId = 3 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SWELLOW] = { - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHROOMISH] = { - { .songLengthId = 39 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BRELOOM] = { - { .songLengthId = 9 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SPINDA] = { - { .songLengthId = 15 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WINGULL] = { - { .songLengthId = 15 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PELIPPER] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SURSKIT] = { - { .songLengthId = 48 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MASQUERAIN] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WAILMER] = { - { .songLengthId = 5 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WAILORD] = { - { .songLengthId = 3 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SKITTY] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DELCATTY] = { - { .songLengthId = 9 }, - { .songLengthId = 0 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KECLEON] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BALTOY] = { - { .songLengthId = 1 }, - { .songLengthId = 30 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLAYDOL] = { - { .songLengthId = 3 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NOSEPASS] = { - { .songLengthId = 24 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TORKOAL] = { - { .songLengthId = 24 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SABLEYE] = { - { .songLengthId = 3 }, - { .songLengthId = 11 }, - { .songLengthId = 18 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BARBOACH] = { - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WHISCASH] = { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LUVDISC] = { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CORPHISH] = { - { .songLengthId = 24 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CRAWDAUNT] = { - { .songLengthId = 27 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FEEBAS] = { - { .songLengthId = 14 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MILOTIC] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CARVANHA] = { - { .songLengthId = 27 }, - { .songLengthId = 1 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHARPEDO] = { - { .songLengthId = 29 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TRAPINCH] = { - { .songLengthId = 0 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VIBRAVA] = { - { .songLengthId = 17 }, - { .songLengthId = 27 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_FLYGON] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAKUHITA] = { - { .songLengthId = 27 }, - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HARIYAMA] = { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ELECTRIKE] = { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MANECTRIC] = { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_NUMEL] = { - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CAMERUPT] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SPHEAL] = { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEALEO] = { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WALREIN] = { - { .songLengthId = 27 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CACNEA] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CACTURNE] = { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SNORUNT] = { - { .songLengthId = 24 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GLALIE] = { - { .songLengthId = 5 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LUNATONE] = { - { .songLengthId = 39 }, - { .songLengthId = 44 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SOLROCK] = { - { .songLengthId = 24 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AZURILL] = { - { .songLengthId = 6 }, - { .songLengthId = 39 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SPOINK] = { - { .songLengthId = 30 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GRUMPIG] = { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_PLUSLE] = { - { .songLengthId = 42 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MINUN] = { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MAWILE] = { - { .songLengthId = 27 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEDITITE] = { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_MEDICHAM] = { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 0 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SWABLU] = { - { .songLengthId = 27 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ALTARIA] = { - { .songLengthId = 6 }, - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WYNAUT] = { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DUSKULL] = { - { .songLengthId = 42 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DUSCLOPS] = { - { .songLengthId = 42 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ROSELIA] = { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLAKOTH] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VIGOROTH] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SLAKING] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GULPIN] = { - { .songLengthId = 36 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SWALOT] = { - { .songLengthId = 27 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_TROPIUS] = { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_WHISMUR] = { - { .songLengthId = 17 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LOUDRED] = { - { .songLengthId = 33 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_EXPLOUD] = { - { .songLengthId = 9 }, - { .songLengthId = 33 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CLAMPERL] = { - { .songLengthId = 0 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_HUNTAIL] = { - { .songLengthId = 42 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GOREBYSS] = { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ABSOL] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHUPPET] = { - { .songLengthId = 42 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BANETTE] = { - { .songLengthId = 3 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SEVIPER] = { - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ZANGOOSE] = { - { .songLengthId = 3 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RELICANTH] = { - { .songLengthId = 9 }, - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARON] = { - { .songLengthId = 27 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LAIRON] = { - { .songLengthId = 5 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_AGGRON] = { - { .songLengthId = 0 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CASTFORM_NORMAL] = { - { .songLengthId = 0 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_VOLBEAT] = { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ILLUMISE] = { - { .songLengthId = 12 }, - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 3 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LILEEP] = { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CRADILY] = { - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 12 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ANORITH] = { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 17 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_ARMALDO] = { - { .songLengthId = 27 }, - { .songLengthId = 27 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RALTS] = { - { .songLengthId = 7 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KIRLIA] = { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GARDEVOIR] = { - { .songLengthId = 27 }, - { .songLengthId = 9 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BAGON] = { - { .songLengthId = 5 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SHELGON] = { - { .songLengthId = 9 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_SALAMENCE] = { - { .songLengthId = 0 }, - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_BELDUM] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_METANG] = { - { .songLengthId = 9 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_METAGROSS] = { - { .songLengthId = 9 }, - { .songLengthId = 42 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_REGIROCK] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_REGICE] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_REGISTEEL] = { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_KYOGRE] = { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 48 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_GROUDON] = { - { .songLengthId = 33 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_RAYQUAZA] = { - { .songLengthId = 3 }, - { .songLengthId = 3 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LATIAS] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_LATIOS] = { - { .songLengthId = 0 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_JIRACHI] = { - { .songLengthId = 48 }, - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_DEOXYS_NORMAL] = { - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, [SPECIES_CHIMECHO] = { - { .songLengthId = 18 }, - { .songLengthId = 9 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, } diff --git a/src/data/bard_music/speech.h b/src/data/bard_music/speech.h index dc7844ec89..d6f409be8b 100644 --- a/src/data/bard_music/speech.h +++ b/src/data/bard_music/speech.h @@ -1,482 +1,482 @@ #ifndef GUARD_DATA_BARD_MUSIC_SPEECH_H #define GUARD_DATA_BARD_MUSIC_SPEECH_H -const struct BardSound gBardSounds_Speech[][6] = { - { - { .songLengthId = 9 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Speech[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_LISTEN)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 9 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_NOT_VERY)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MEAN)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LAY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 10 }, + [EC_INDEX(EC_WORD_RECOMMEND)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NITWIT)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_QUITE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FROM)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FEELING)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BUT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 9 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_HOWEVER)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CASE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THE)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_MISS)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HOW)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ENOUGH)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 23 }, + [EC_INDEX(EC_WORD_A_LOT)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_A_LITTLE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 45 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ABSOLUTELY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_AND)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ONLY)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, + [EC_INDEX(EC_WORD_AROUND)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PROBABLY)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_IF)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VERY)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 20 }, - { .songLengthId = 12 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_A_TINY_BIT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WILD)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 11 }, + [EC_INDEX(EC_WORD_THAT_S)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_JUST)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 11 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVEN_SO)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MUST_BE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 48 }, - { .songLengthId = 6 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NATURALLY)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 35 }, + [EC_INDEX(EC_WORD_FOR_NOW)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 50 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_UNDERSTOOD)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_JOKING)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_READY)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_SOMETHING)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 35 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOMEHOW)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALTHOUGH)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALSO)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PERFECT)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 1 }, + [EC_INDEX(EC_WORD_AS_MUCH_AS)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 10 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_REALLY)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRULY)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 14 }, - { .songLengthId = 38 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SERIOUSLY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 7 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOTALLY)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 16 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UNTIL)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AS_IF)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 40 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MOOD)] = { + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RATHER)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 38 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AWFULLY)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_MODE)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MORE)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOO_LATE)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 6 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FINALLY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ANY)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_INSTEAD)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FANTASTIC)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/status.h b/src/data/bard_music/status.h index 9a3fd01393..d4acac9739 100644 --- a/src/data/bard_music/status.h +++ b/src/data/bard_music/status.h @@ -1,874 +1,874 @@ #ifndef GUARD_DATA_BARD_MUSIC_STATUS_H #define GUARD_DATA_BARD_MUSIC_STATUS_H -const struct BardSound gBardSounds_Status[][6] = { - { - { .songLengthId = 8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Status[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_DARK)] = { + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STENCH)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THICK_FAT)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RAIN_DISH)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DRIZZLE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 12 }, - { .songLengthId = 6 }, - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_ARENA_TRAP)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 17 }, - { .songLengthId = 44 }, - { .songLengthId = 3 }, + [EC_INDEX(EC_WORD_INTIMIDATE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ROCK_HEAD)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COLOR)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 50 }, - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_ALT_COLOR)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ROCK)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 36 }, + [EC_INDEX(EC_WORD_BEAUTIFUL)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEAUTY)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 21 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AIR_LOCK)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PSYCHIC)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_HYPER_CUTTER)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FIGHTING)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 24 }, - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_SHADOW_TAG)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMART)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 50 }, - { .songLengthId = 9 }, + [EC_INDEX(EC_WORD_SMARTNESS)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SPEED_BOOST)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COOL)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 41 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COOLNESS)] = { + { .songId = PHONEME_ID(PH_GOOSE_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 6 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_BATTLE_ARMOR)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CUTE)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CUTENESS)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STURDY)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 15 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SUCTION_CUPS)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GRASS)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 23 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_CLEAR_BODY)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TORRENT)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GHOST)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ICE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GUTS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ROUGH_SKIN)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 6 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHELL_ARMOR)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 50 }, - { .songLengthId = 8 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NATURAL_CURE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAMP)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GROUND)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LIMBER)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MAGNET_PULL)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHITE_SMOKE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 24 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SYNCHRONIZE)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 48 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_OVERGROW)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SWIFT_SWIM)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SAND_STREAM)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SAND_VEIL)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KEEN_EYE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 48 }, - { .songLengthId = 24 }, - { .songLengthId = 42 }, + [EC_INDEX(EC_WORD_INNER_FOCUS)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STATIC)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TYPE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOUGH)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TOUGHNESS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHED_SKIN)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_HUGE_POWER)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 36 }, - { .songLengthId = 44 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_VOLT_ABSORB)] = { + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 48 }, - { .songLengthId = 44 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_WATER_ABSORB)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 9 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_ELECTRIC)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 2 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FORECAST)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 14 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SERENE_GRACE)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 32 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_POISON)] = { + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 32 }, - { .songLengthId = 27 }, - { .songLengthId = 30 }, + [EC_INDEX(EC_WORD_POISON_POINT)] = { + { .songId = PHONEME_ID(PH_CHOICE_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DRAGON)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRACE)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OBLIVIOUS)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 0 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRUANT)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 8 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_RUN_AWAY)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_STICKY_HOLD)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CLOUD_NINE)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NORMAL)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STEEL)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 15 }, - { .songLengthId = 3 }, + [EC_INDEX(EC_WORD_ILLUMINATE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_EARLY_BIRD)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 38 }, + [EC_INDEX(EC_WORD_HUSTLE)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHINE)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FLYING)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DROUGHT)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 17 }, - { .songLengthId = 21 }, + [EC_INDEX(EC_WORD_LIGHTNINGROD)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 33 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COMPOUNDEYES)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 36 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_MARVEL_SCALE)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 48 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_WONDER_GUARD)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 21 }, - { .songLengthId = 12 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_INSOMNIA)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 12 }, - { .songLengthId = 3 }, + [EC_INDEX(EC_WORD_LEVITATE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PLUS)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PRESSURE)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 9 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_LIQUID_OOZE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 48 }, - { .songLengthId = 3 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COLOR_CHANGE)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 39 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOUNDPROOF)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 9 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EFFECT_SPORE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 42 }, + [EC_INDEX(EC_WORD_PKRS)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FIRE)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 21 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_FLAME_BODY)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MINUS)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_OWN_TEMPO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 1 }, - { .songLengthId = 44 }, - { .songLengthId = 27 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_MAGMA_ARMOR)] = { + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WATER)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 48 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WATER_VEIL)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BUG)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 7 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SWARM)] = { + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 7 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CUTE_CHARM)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 39 }, - { .songLengthId = 17 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_IMMUNITY)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BLAZE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PICKUP)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PATTERN)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 20 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_FLASH_FIRE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 27 }, - { .songLengthId = 48 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_VITAL_SPIRIT)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CHLOROPHYLL)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 45 }, - { .songLengthId = 33 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_PURE_POWER)] = { + { .songId = PHONEME_ID(PH_CURE_BLEND) }, + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 43 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHIELD_DUST)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/time.h b/src/data/bard_music/time.h index 1f7dac8a60..a2952517ef 100644 --- a/src/data/bard_music/time.h +++ b/src/data/bard_music/time.h @@ -1,362 +1,362 @@ #ifndef GUARD_DATA_BARD_MUSIC_TIME_H #define GUARD_DATA_BARD_MUSIC_TIME_H -const struct BardSound gBardSounds_Time[][6] = { - { - { .songLengthId = 27 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Time[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_FALL)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MORNING)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 28 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_TOMORROW)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 2 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LAST)] = { + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOMETIME)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALWAYS)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CURRENT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 9 }, - { .songLengthId = 44 }, + [EC_INDEX(EC_WORD_FOREVER)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAYS)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_END)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TUESDAY)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 50 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_YESTERDAY)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TODAY)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FRIDAY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MONDAY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LATER)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 12 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_EARLIER)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 44 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_ANOTHER)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TIME)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 17 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FINISH)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WEDNESDAY)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 40 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SOON)] = { + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_START)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MONTH)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_STOP)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 33 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NOW)] = { + { .songId = PHONEME_ID(PH_MOUTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FINAL)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEXT)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AGE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 48 }, - { .songLengthId = 5 }, + [EC_INDEX(EC_WORD_SATURDAY)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SUMMER)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SUNDAY)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 15 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BEGINNING)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SPRING)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAYTIME)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 50 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WINTER)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DAILY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 10 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OLDEN)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ALMOST)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEARLY)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 48 }, - { .songLengthId = 5 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_THURSDAY)] = { + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 18 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NIGHTTIME)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 20 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NIGHT)] = { + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 14 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WEEK)] = { + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/trainer.h b/src/data/bard_music/trainer.h index 05fc6a6ef4..d49397eabf 100644 --- a/src/data/bard_music/trainer.h +++ b/src/data/bard_music/trainer.h @@ -1,218 +1,218 @@ #ifndef GUARD_DATA_BARD_MUSIC_TRAINER_H #define GUARD_DATA_BARD_MUSIC_TRAINER_H -const struct BardSound gBardSounds_Trainer[][6] = { - { - { .songLengthId = 18 }, - { .songLengthId = 39 }, - { .songLengthId = 45 }, +static const struct BardSoundTemplate sBardSoundTemplates_Trainer[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_I_CHOOSE_YOU)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_CURE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 21 }, - { .songLengthId = 42 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GOTCHA)] = { + { .songId = PHONEME_ID(PH_LOT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRADE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 18 }, - { .songLengthId = 50 }, + [EC_INDEX(EC_WORD_SAPPHIRE)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 27 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EVOLVE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 18 }, - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_ENCYCLOPEDIA)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, }, - { - { .songLengthId = 3 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_NATURE)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CENTER)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EGG)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LINK)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 8 }, - { .songLengthId = 6 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_SP_ABILITY)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_SOLO) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, }, - { - { .songLengthId = 3 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TRAINER)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 50 }, - { .songLengthId = 15 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_VERSION)] = { + { .songId = PHONEME_ID(PH_NURSE_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_POKENAV)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 27 }, + [EC_INDEX(EC_WORD_POKEMON)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GET)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 12 }, - { .songLengthId = 9 }, + [EC_INDEX(EC_WORD_POKEDEX)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_RUBY)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LEVEL)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, + [EC_INDEX(EC_WORD_RED)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GREEN)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, + [EC_INDEX(EC_WORD_BAG)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FLAME)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_GOLD)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_LEAF)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_SILVER)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 48 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_EMERALD)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/trendysaying.h b/src/data/bard_music/trendysaying.h index ccd9083ead..575f105cbc 100644 --- a/src/data/bard_music/trendysaying.h +++ b/src/data/bard_music/trendysaying.h @@ -1,266 +1,266 @@ #ifndef GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H #define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H -const struct BardSound gBardSounds_TrendySaying[][6] = { - { - { .songLengthId = 5 }, - { .songLengthId = 2 }, - { .songLengthId = 20 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_TrendySaying[NUM_TRENDY_SAYINGS][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_KTHX_BYE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YES_SIR_EXCL)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27 }, - { .songLengthId = 27 }, - { .songLengthId = 23 }, + [EC_INDEX(EC_WORD_AVANT_GARDE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_THOUGHT_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 38 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_COUPLE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 44 }, - { .songLengthId = 18 }, + [EC_INDEX(EC_WORD_MUCH_OBLIGED)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 29 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YEEHAW_EXCL)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MEGA)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 17 }, - { .songLengthId = 3 }, - { .songLengthId = 26 }, + [EC_INDEX(EC_WORD_1_HIT_KO_EXCL)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 11 }, - { .songLengthId = 17 }, - { .songLengthId = 14 }, + [EC_INDEX(EC_WORD_DESTINY)] = { + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CANCEL)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NEW)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 9 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FLATTEN)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KIDDING)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOSER)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_LOSING)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 0 }, - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAPPENING)] = { + { .songId = PHONEME_ID(PH_TRAP_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIP_AND)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHAKE)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHADY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UPBEAT)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MODERN)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SMELL_YA)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 3 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BANG)] = { + { .songId = PHONEME_ID(PH_FACE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 35 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_KNOCKOUT)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 36 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HASSLE)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WINNER)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_FEVER)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 29 }, - { .songLengthId = 44 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_WANNABE)] = { + { .songId = PHONEME_ID(PH_THOUGHT_SOLO) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_BABY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEART)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OLD)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 43 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YOUNG)] = { + { .songId = PHONEME_ID(PH_STRUT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UGLY)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, diff --git a/src/data/bard_music/voices.h b/src/data/bard_music/voices.h index 97f249ecb5..ca7012198f 100644 --- a/src/data/bard_music/voices.h +++ b/src/data/bard_music/voices.h @@ -1,507 +1,507 @@ #ifndef GUARD_DATA_BARD_MUSIC_VOICES_H #define GUARD_DATA_BARD_MUSIC_VOICES_H -const struct BardSound gBardSounds_Voices[][6] = { - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, +static const struct BardSoundTemplate sBardSoundTemplates_Voices[][MAX_BARD_SOUNDS_PER_WORD] = { + [EC_INDEX(EC_WORD_EXCL)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EXCL_EXCL)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_QUES_EXCL)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_QUES)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ELLIPSIS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ELLIPSIS_EXCL)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 48 }, - { .songLengthId = 51 }, - { .songLengthId = 12 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, + PREV_BARD_SOUND, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DASH)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_DASH_DASH_DASH)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 26 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UH_OH)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 27, .songLengthOffset = 0x5, .unused = 0x8 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAAAH)] = { + { .songId = PHONEME_ID(PH_THOUGHT_BLEND), .lengthAdjustment = +5, .unused = 8 }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AHAHA)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OH_QUES)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_NOPE)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_URGH)] = { + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 40 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HMM)] = { + { .songId = PHONEME_ID(PH_GOOSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 25 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WHOAH)] = { + { .songId = PHONEME_ID(PH_GOAT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 49 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WROOOAAR_EXCL)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + { .songId = PHONEME_ID(PH_NURSE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 35 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WOW)] = { + { .songId = PHONEME_ID(PH_MOUTH_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 17 }, - { .songLengthId = 17 }, - { .songLengthId = 17 }, + [EC_INDEX(EC_WORD_GIGGLE)] = { + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, + { .songId = PHONEME_ID(PH_KIT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 10 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SIGH)] = { + { .songId = PHONEME_ID(PH_DRESS_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 14 }, - { .songLengthId = 12 }, - { .songLengthId = 2 }, - { .songLengthId = 36 }, + [EC_INDEX(EC_WORD_UNBELIEVABLE)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_SOLO) }, + { .songId = PHONEME_ID(PH_FOOT_BLEND) }, NULL_BARD_SOUND, }, - { - { .songLengthId = 19 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CRIES)] = { + { .songId = PHONEME_ID(PH_PRICE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 14 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AGREE)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EH_QUES)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 18 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_CRY)] = { + { .songId = PHONEME_ID(PH_PRICE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_EHEHE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 30 }, - { .songLengthId = 30 }, - { .songLengthId = 30 }, + [EC_INDEX(EC_WORD_OI_OI_OI)] = { + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, + { .songId = PHONEME_ID(PH_CHOICE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 1 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OH_YEAH)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_TRAP_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OH)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OOPS)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 23 }, - { .songLengthId = 11 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SHOCKED)] = { + { .songId = PHONEME_ID(PH_LOT_SOLO) }, + { .songId = PHONEME_ID(PH_DRESS_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 13 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_EEK)] = { + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GRAAAH)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 23 }, + [EC_INDEX(EC_WORD_GWAHAHAHA)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_LOT_SOLO) }, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 5 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WAY)] = { + { .songId = PHONEME_ID(PH_FACE_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_TCH)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEHE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HAH)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 44 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YUP)] = { + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_HAHAHA)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 19 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AIYEEH)] = { + { .songId = PHONEME_ID(PH_PRICE_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 7 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HIYAH)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 39 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_FUFUFU)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 26 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_LOL)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 26 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_SNORT)] = { + { .songId = PHONEME_ID(PH_GOAT_SOLO) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HUMPH)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 12 }, - { .songLengthId = 12 }, - { .songLengthId = 12 }, + [EC_INDEX(EC_WORD_HEHEHE)] = { + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 9 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_HEH)] = { + { .songId = PHONEME_ID(PH_DRESS_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 24 }, - { .songLengthId = 24 }, + [EC_INDEX(EC_WORD_HOHOHO)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 42 }, - { .songLengthId = 44 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_UH_HUH)] = { + { .songId = PHONEME_ID(PH_STRUT_BLEND) }, + { .songId = PHONEME_ID(PH_STRUT_SOLO) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 14 }, - { .songLengthId = 48 }, + [EC_INDEX(EC_WORD_OH_DEAR)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FLEECE_SOLO) }, + { .songId = PHONEME_ID(PH_NURSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 28 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_ARRGH)] = { + { .songId = PHONEME_ID(PH_THOUGHT_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 39 }, - { .songLengthId = 39 }, - { .songLengthId = 39 }, + [EC_INDEX(EC_WORD_MUFUFU)] = { + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, + { .songId = PHONEME_ID(PH_GOOSE_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 15 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_MMM)] = { + { .songId = PHONEME_ID(PH_KIT_BLEND) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OH_KAY)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 24 }, - { .songLengthId = 4 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_OKAY)] = { + { .songId = PHONEME_ID(PH_GOAT_BLEND) }, + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_LALALA)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 4 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_YAY)] = { + { .songId = PHONEME_ID(PH_FACE_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 7 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_AWW)] = { + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 34 }, - { .songLengthId = 13 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_WOWEE)] = { + { .songId = PHONEME_ID(PH_MOUTH_HELD) }, + { .songId = PHONEME_ID(PH_FLEECE_HELD) }, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 7 }, - { .songLengthId = 51 }, - { .songLengthId = 51 }, + [EC_INDEX(EC_WORD_GWAH)] = { + { .songId = PHONEME_ID(PH_CLOTH_HELD) }, + PREV_BARD_SOUND, + PREV_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, NULL_BARD_SOUND, }, - { - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, - { .songLengthId = 6 }, + [EC_INDEX(EC_WORD_WAHAHAHA)] = { + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, + { .songId = PHONEME_ID(PH_CLOTH_BLEND) }, NULL_BARD_SOUND, NULL_BARD_SOUND, } diff --git a/src/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h deleted file mode 100644 index 7b4205da5f..0000000000 --- a/src/data/bard_music/word_pitch.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef GUARD_WORD_PITCH_H -#define GUARD_WORD_PITCH_H - -#define PITCH_END 0x1800 - -static const s16 sPitch1_0[] = { -0x300, PITCH_END }; -static const s16 sPitch1_1[] = { 0x0900, PITCH_END }; -static const s16 sPitch1_2[] = { 0x0100, PITCH_END }; -static const s16 sPitch1_3[] = { 0x0400, PITCH_END }; -static const s16 sPitch1_4[] = { 0x0b00, PITCH_END }; -static const s16 sPitch2_0[] = { -0x300, -0x100, PITCH_END }; -static const s16 sPitch2_1[] = { -0x300, 0x0200, PITCH_END }; -static const s16 sPitch2_2[] = { 0x0200, 0x0400, PITCH_END }; -static const s16 sPitch2_3[] = { 0x0600, 0x0800, PITCH_END }; -static const s16 sPitch2_4[] = { 0x0900, 0x0800, PITCH_END }; -static const s16 sPitch3_0[] = { -0x300, -0x100, -0x300, PITCH_END }; -static const s16 sPitch3_1[] = { 0x0400, -0x300, 0x0400, PITCH_END }; -static const s16 sPitch3_2[] = { 0x0900, 0x0800, 0x0600, PITCH_END }; -static const s16 sPitch3_3[] = { 0x0100, 0x0200, 0x0400, PITCH_END }; -static const s16 sPitch3_4[] = { 0x0600, 0x1000, 0x0d00, PITCH_END }; -static const s16 sPitch4_0[] = { 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END }; -static const s16 sPitch4_1[] = { 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END }; -static const s16 sPitch4_2[] = { 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; -static const s16 sPitch4_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; -static const s16 sPitch4_4[] = { 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END }; -static const s16 sPitch5_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END }; -static const s16 sPitch5_1[] = { 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; -static const s16 sPitch5_2[] = { 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END }; -static const s16 sPitch5_3[] = { 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END }; -static const s16 sPitch5_4[] = { 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END }; -static const s16 sPitch6_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; -static const s16 sPitch6_1[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END }; -static const s16 sPitch6_2[] = { 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END }; -static const s16 sPitch6_3[] = { 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END }; -static const s16 sPitch6_4[] = { 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END }; -static const s16 sPitch7_0[] = { 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END }; -static const s16 sPitch7_1[] = { 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END }; -static const s16 sPitch7_2[] = { 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END }; -static const s16 sPitch7_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END }; -static const s16 sPitch7_4[] = { 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END }; - -// Only sPitch7_# are used below -// This table is always indexed with (x + 30), where x is some value 0 - 4 -static const s16 *const sBardSoundPitchTables[] = { - sPitch1_0, sPitch1_1, sPitch1_2, sPitch1_3, sPitch1_4, - sPitch2_0, sPitch2_1, sPitch2_2, sPitch2_3, sPitch2_4, - sPitch3_0, sPitch3_1, sPitch3_2, sPitch3_3, sPitch3_4, - sPitch4_0, sPitch4_1, sPitch4_2, sPitch4_3, sPitch4_4, - sPitch5_0, sPitch5_1, sPitch5_2, sPitch5_3, sPitch5_4, - sPitch6_0, sPitch6_1, sPitch6_2, sPitch6_3, sPitch6_4, - sPitch7_0, sPitch7_1, sPitch7_2, sPitch7_3, sPitch7_4 -}; - - -#endif //GUARD_WORD_PITCH_H diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 340bdb1fa6..1cab4fc833 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -410,22 +410,33 @@ static const struct FormChange sGlalieFormChangeTable[] = { #if P_FAMILY_CASTFORM static const struct FormChange sCastformFormChangeTable[] = { +#if OW_FOLLOWERS_WEATHER_FORMS == TRUE + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_SUNNY, WEATHER_SUNNY_CLOUDS}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_SUNNY, WEATHER_DROUGHT}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_RAINY, WEATHER_RAIN}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_RAINY, WEATHER_RAIN_THUNDERSTORM}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_RAINY, WEATHER_DOWNPOUR}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_SNOWY, WEATHER_SNOW}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CASTFORM_NORMAL, WEATHER_NONE}, + {FORM_CHANGE_BEGIN_BATTLE, SPECIES_CASTFORM_NORMAL}, // To prevent Battles from being affected. + {FORM_CHANGE_DEPOSIT, SPECIES_CASTFORM_NORMAL}, // To prevent depositing weather forms into the PC. +#endif //OW_FOLLOWERS_WEATHER_FORMS #if B_WEATHER_FORMS >= GEN_5 - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN, ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN, ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW, ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW), ABILITY_FORECAST}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE, ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN, ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN, ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW, ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW), ABILITY_FORECAST}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE, ABILITY_FORECAST}, #else - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW)}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SUNNY, B_WEATHER_SUN}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_RAINY, B_WEATHER_RAIN}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_SNOWY, B_WEATHER_HAIL | B_WEATHER_SNOW}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, ~(B_WEATHER_SUN | B_WEATHER_RAIN | B_WEATHER_HAIL | B_WEATHER_SNOW)}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CASTFORM_NORMAL, B_WEATHER_NONE}, #endif - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CASTFORM_NORMAL}, - {FORM_CHANGE_FAINT, SPECIES_CASTFORM_NORMAL}, - {FORM_CHANGE_END_BATTLE, SPECIES_CASTFORM_NORMAL}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CASTFORM_NORMAL}, + {FORM_CHANGE_FAINT, SPECIES_CASTFORM_NORMAL}, + {FORM_CHANGE_END_BATTLE, SPECIES_CASTFORM_NORMAL}, {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CASTFORM @@ -531,18 +542,24 @@ static const struct FormChange sBurmyFormChangeTable[] = { #if P_FAMILY_CHERUBI static const struct FormChange sCherrimFormChangeTable[] = { +#if OW_FOLLOWERS_WEATHER_FORMS == TRUE + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CHERRIM_SUNSHINE, WEATHER_DROUGHT}, + {FORM_CHANGE_OVERWORLD_WEATHER, SPECIES_CHERRIM_OVERCAST, WEATHER_NONE}, + {FORM_CHANGE_BEGIN_BATTLE, SPECIES_CHERRIM_OVERCAST}, // To prevent Battles from being affected. + {FORM_CHANGE_DEPOSIT, SPECIES_CHERRIM_OVERCAST}, // To prevent depositing weather forms into the PC. +#endif //OW_FOLLOWERS_WEATHER_FORMS #if B_WEATHER_FORMS >= GEN_5 - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE, ABILITY_FLOWER_GIFT}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN, ABILITY_FLOWER_GIFT}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE, ABILITY_FLOWER_GIFT}, #else - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN}, - {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_SUNSHINE, B_WEATHER_SUN}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, ~B_WEATHER_SUN}, + {FORM_CHANGE_BATTLE_WEATHER, SPECIES_CHERRIM_OVERCAST, B_WEATHER_NONE}, #endif - {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CHERRIM_OVERCAST}, - {FORM_CHANGE_FAINT, SPECIES_CHERRIM_OVERCAST}, - {FORM_CHANGE_END_BATTLE, SPECIES_CHERRIM_OVERCAST}, + {FORM_CHANGE_BATTLE_SWITCH, SPECIES_CHERRIM_OVERCAST}, + {FORM_CHANGE_FAINT, SPECIES_CHERRIM_OVERCAST}, + {FORM_CHANGE_END_BATTLE, SPECIES_CHERRIM_OVERCAST}, {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CHERUBI diff --git a/src/data/trainers.h b/src/data/trainers.h index ffe1d90f02..a491b482ed 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -15,7 +15,7 @@ .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1, #line 79 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 81 TRAINER_ENCOUNTER_MUSIC_MALE, #line 82 @@ -34,7 +34,7 @@ .trainerClass = TRAINER_CLASS_HIKER, #line 87 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 89 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 90 @@ -66,7 +66,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 100 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 102 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 103 @@ -98,7 +98,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 113 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 115 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 116 @@ -141,7 +141,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 130 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 132 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 133 @@ -173,7 +173,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 143 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 145 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 146 @@ -205,7 +205,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 156 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 158 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 159 @@ -237,7 +237,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 169 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 171 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 172 @@ -269,7 +269,7 @@ .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 182 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 184 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 185 @@ -301,9 +301,9 @@ .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 195 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 196 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 197 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 198 @@ -390,7 +390,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 228 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 230 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 231 @@ -422,7 +422,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 241 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 243 TRAINER_ENCOUNTER_MUSIC_COOL, #line 244 @@ -467,7 +467,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 259 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 261 TRAINER_ENCOUNTER_MUSIC_COOL, #line 262 @@ -510,7 +510,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 276 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 278 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 279 @@ -553,9 +553,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 293 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 294 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 295 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 296 @@ -587,7 +587,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 306 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 308 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 309 @@ -619,7 +619,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 319 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 321 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 322 @@ -651,7 +651,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 332 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 334 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 335 @@ -694,7 +694,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 349 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 351 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 352 @@ -737,7 +737,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 366 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 368 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 369 @@ -791,7 +791,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 387 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 389 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 390 @@ -823,7 +823,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 400 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 402 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 403 @@ -866,7 +866,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 417 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 419 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 420 @@ -898,7 +898,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 430 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 432 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 433 @@ -930,7 +930,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 443 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 445 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 446 @@ -962,7 +962,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 456 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 458 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 459 @@ -1005,9 +1005,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 473 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 474 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 475 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 476 @@ -1039,9 +1039,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 486 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 487 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 488 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 489 @@ -1073,9 +1073,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 499 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 500 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 501 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 502 @@ -1107,7 +1107,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 512 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 514 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 515 @@ -1150,7 +1150,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AQUA_ADMIN, #line 529 .trainerPic = TRAINER_PIC_AQUA_ADMIN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 531 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 532 @@ -1195,7 +1195,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 547 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 549 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 550 @@ -1227,9 +1227,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AQUA_ADMIN, #line 560 .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 561 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 562 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 563 @@ -1272,9 +1272,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AQUA_ADMIN, #line 577 .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 578 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 579 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 580 @@ -1317,7 +1317,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AQUA_LEADER, #line 594 .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, - .encounterMusic_gender = + .encounterMusic_gender = #line 596 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 597 @@ -1373,9 +1373,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 616 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 617 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 618 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 619 @@ -1407,9 +1407,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 629 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 630 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 631 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 632 @@ -1452,9 +1452,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 646 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 647 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 648 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 649 @@ -1508,7 +1508,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 667 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 669 TRAINER_ENCOUNTER_MUSIC_COOL, #line 670 @@ -1562,9 +1562,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 688 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 689 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 690 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 691 @@ -1607,9 +1607,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 705 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 706 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 707 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 708 @@ -1652,9 +1652,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 722 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 723 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 724 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 725 @@ -1708,9 +1708,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 743 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 744 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 745 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 746 @@ -1764,9 +1764,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 764 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 765 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 766 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 767 @@ -1820,7 +1820,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 785 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 787 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 788 @@ -1859,7 +1859,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 802 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 804 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 805 @@ -1934,7 +1934,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 835 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 837 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 838 @@ -1991,7 +1991,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 860 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 862 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 863 @@ -2030,7 +2030,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 877 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 879 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 880 @@ -2069,7 +2069,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 894 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 896 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 897 @@ -2108,7 +2108,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 911 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 913 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 914 @@ -2147,7 +2147,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 928 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 930 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 931 @@ -2190,7 +2190,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 945 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 947 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 948 @@ -2233,7 +2233,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 962 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 964 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 965 @@ -2276,7 +2276,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 979 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 981 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 982 @@ -2319,7 +2319,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 996 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 998 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 999 @@ -2362,7 +2362,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_INTERVIEWER, #line 1013 .trainerPic = TRAINER_PIC_INTERVIEWER, - .encounterMusic_gender = + .encounterMusic_gender = #line 1015 TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, #line 1016 @@ -2419,9 +2419,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1038 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1039 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1040 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1041 @@ -2464,9 +2464,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1055 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1056 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1057 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1058 @@ -2498,9 +2498,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1068 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1069 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1070 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1071 @@ -2532,9 +2532,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1081 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1082 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1083 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1084 @@ -2577,9 +2577,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1098 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1099 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1100 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1101 @@ -2622,9 +2622,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1115 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1116 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1117 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1118 @@ -2667,9 +2667,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 1132 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1133 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1134 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1135 @@ -2712,7 +2712,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1149 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1151 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1152 @@ -2751,7 +2751,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1166 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1168 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1169 @@ -2794,7 +2794,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1183 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1185 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1186 @@ -2826,7 +2826,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1196 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1198 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1199 @@ -2865,7 +2865,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1213 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1215 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1216 @@ -2904,7 +2904,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1230 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1232 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1233 @@ -2943,7 +2943,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 1247 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1249 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 1250 @@ -2982,7 +2982,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1264 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1266 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1267 @@ -3022,7 +3022,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1281 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1283 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1284 @@ -3062,7 +3062,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1298 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1300 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1301 @@ -3104,7 +3104,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1315 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1317 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1318 @@ -3143,7 +3143,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1331 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1333 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1334 @@ -3256,7 +3256,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1381 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1383 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1384 @@ -3312,7 +3312,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1403 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1405 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1406 @@ -3357,7 +3357,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1421 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1423 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1424 @@ -3413,7 +3413,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1443 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1445 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1446 @@ -3458,7 +3458,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1461 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1463 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1464 @@ -3503,7 +3503,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1479 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1481 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1482 @@ -3559,7 +3559,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1501 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1503 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1504 @@ -3626,7 +3626,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1527 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1529 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1530 @@ -3682,7 +3682,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1549 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1551 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1552 @@ -3738,7 +3738,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1571 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1573 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1574 @@ -3794,7 +3794,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1593 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1595 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1596 @@ -3850,7 +3850,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1615 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1617 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1618 @@ -3906,7 +3906,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1637 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 1639 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1640 @@ -3951,9 +3951,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1655 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1656 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1657 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1658 @@ -3992,9 +3992,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1671 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1672 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1673 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1674 @@ -4034,9 +4034,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1688 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1689 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1690 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1691 @@ -4075,9 +4075,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1704 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1705 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1706 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1707 @@ -4154,9 +4154,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1738 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1739 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1740 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1741 @@ -4201,9 +4201,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1756 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1757 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1758 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1759 @@ -4259,9 +4259,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1778 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1779 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1780 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1781 @@ -4295,9 +4295,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1792 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1793 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1794 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1795 @@ -4331,9 +4331,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1806 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1807 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1808 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1809 @@ -4367,9 +4367,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1820 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1821 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1822 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1823 @@ -4425,9 +4425,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1842 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1843 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1844 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1845 @@ -4472,9 +4472,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1860 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1861 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1862 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1863 @@ -4530,9 +4530,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1882 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1883 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1884 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1885 @@ -4588,9 +4588,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1904 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1905 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1906 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1907 @@ -4646,9 +4646,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1926 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1927 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1928 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1929 @@ -4704,9 +4704,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 1948 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 1949 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1950 TRAINER_ENCOUNTER_MUSIC_COOL, #line 1951 @@ -4762,9 +4762,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 1970 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 1971 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1972 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 1973 @@ -4807,9 +4807,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 1987 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 1988 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 1989 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 1990 @@ -4852,9 +4852,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2004 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2005 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2006 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2007 @@ -4897,9 +4897,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2021 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2022 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2023 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2024 @@ -4931,9 +4931,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2034 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2035 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2036 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2037 @@ -4965,9 +4965,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2047 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2048 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2049 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2050 @@ -5010,9 +5010,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2064 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2065 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2066 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2067 @@ -5055,9 +5055,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2081 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2082 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2083 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2084 @@ -5100,9 +5100,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 2098 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2099 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2100 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2101 @@ -5156,9 +5156,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2119 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2120 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2121 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2122 @@ -5194,9 +5194,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2133 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2134 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2135 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2136 @@ -5259,7 +5259,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 2159 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2161 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 2162 @@ -5313,9 +5313,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2180 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2181 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2182 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2183 @@ -5356,9 +5356,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2196 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2197 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2198 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2199 @@ -5394,9 +5394,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2210 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2211 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2212 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2213 @@ -5432,9 +5432,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2224 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2225 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2226 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2227 @@ -5470,9 +5470,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2238 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2239 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2240 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2241 @@ -5508,9 +5508,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2252 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2253 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2254 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2255 @@ -5546,9 +5546,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 2266 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2267 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2268 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2269 @@ -5591,9 +5591,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2284 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2285 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2286 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2287 @@ -5625,9 +5625,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2297 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2298 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2299 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2300 @@ -5659,9 +5659,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2310 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2311 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2312 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2313 @@ -5693,9 +5693,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2323 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2324 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2325 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2326 @@ -5752,9 +5752,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2348 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2349 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2350 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2351 @@ -5786,9 +5786,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2361 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2362 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2363 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2364 @@ -5820,9 +5820,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2374 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2375 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2376 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2377 @@ -5896,9 +5896,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2406 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2407 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2408 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2409 @@ -5941,9 +5941,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2423 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2424 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2425 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2426 @@ -6000,9 +6000,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2448 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2449 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2450 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2451 @@ -6059,9 +6059,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2473 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2474 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2475 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2476 @@ -6118,9 +6118,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2498 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2499 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2500 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2501 @@ -6177,7 +6177,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2523 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2525 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2526 @@ -6213,9 +6213,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 2537 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 2538 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2539 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 2540 @@ -6258,7 +6258,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2554 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2556 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2557 @@ -6294,7 +6294,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2568 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2570 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2571 @@ -6330,7 +6330,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2582 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2584 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2585 @@ -6366,7 +6366,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2596 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2598 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2599 @@ -6402,7 +6402,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 2610 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2612 TRAINER_ENCOUNTER_MUSIC_RICH, #line 2613 @@ -6445,7 +6445,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2628 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2630 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2631 @@ -6477,9 +6477,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 2641 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 2642 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2643 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 2644 @@ -6522,7 +6522,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2658 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2660 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2661 @@ -6554,9 +6554,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 2671 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 2672 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 2673 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 2674 @@ -6588,7 +6588,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2684 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2686 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2687 @@ -6620,7 +6620,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2697 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2699 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2700 @@ -6663,7 +6663,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2714 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2716 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2717 @@ -6706,7 +6706,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 2731 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 2733 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 2734 @@ -6749,7 +6749,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2748 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2750 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2751 @@ -6781,7 +6781,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2761 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2763 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2764 @@ -6813,7 +6813,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2774 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2776 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2777 @@ -6856,7 +6856,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2791 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2793 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2794 @@ -6910,7 +6910,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2812 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2814 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2815 @@ -6942,7 +6942,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2825 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2827 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2828 @@ -6974,7 +6974,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2838 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2840 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2841 @@ -7006,7 +7006,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2851 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2853 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2854 @@ -7049,7 +7049,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2868 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2870 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2871 @@ -7092,7 +7092,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2885 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2887 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2888 @@ -7124,7 +7124,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2898 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2900 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2901 @@ -7156,7 +7156,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2911 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2913 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2914 @@ -7188,7 +7188,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2924 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2926 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2927 @@ -7220,7 +7220,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2937 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2939 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2940 @@ -7274,7 +7274,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2958 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2960 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2961 @@ -7306,7 +7306,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2971 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2973 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2974 @@ -7338,7 +7338,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 2984 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 2986 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 2987 @@ -7381,7 +7381,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3001 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3003 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3004 @@ -7424,7 +7424,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3018 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3020 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3021 @@ -7456,7 +7456,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3031 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3033 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3034 @@ -7488,7 +7488,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3044 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3046 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3047 @@ -7520,7 +7520,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3057 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3059 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3060 @@ -7552,7 +7552,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3070 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3072 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3073 @@ -7606,7 +7606,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3091 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3093 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3094 @@ -7649,7 +7649,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3108 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3110 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3111 @@ -7681,7 +7681,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3121 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3123 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3124 @@ -7713,7 +7713,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3134 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3136 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3137 @@ -7756,7 +7756,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 3151 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3153 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 3154 @@ -7799,7 +7799,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3168 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3170 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3171 @@ -7831,7 +7831,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3181 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3183 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3184 @@ -7874,7 +7874,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3198 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3200 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3201 @@ -7906,7 +7906,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3211 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3213 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3214 @@ -7949,7 +7949,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3228 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3230 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3231 @@ -7981,7 +7981,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3241 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3243 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3244 @@ -8013,7 +8013,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3254 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3256 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3257 @@ -8056,7 +8056,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3271 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3273 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3274 @@ -8110,7 +8110,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3292 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3294 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3295 @@ -8177,7 +8177,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3317 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3319 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3320 @@ -8220,7 +8220,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3334 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3336 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3337 @@ -8252,7 +8252,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 3347 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 3349 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3350 @@ -8284,7 +8284,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3360 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3362 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3363 @@ -8340,9 +8340,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 3384 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 3385 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 3386 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 3387 @@ -8385,7 +8385,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 3401 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 3403 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 3404 @@ -8417,7 +8417,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3414 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3416 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3417 @@ -8460,7 +8460,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3431 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3433 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3434 @@ -8503,7 +8503,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3448 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3450 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3451 @@ -8546,7 +8546,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3465 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3467 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3468 @@ -8600,7 +8600,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3486 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3488 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3489 @@ -8654,7 +8654,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3507 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3509 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3510 @@ -8708,7 +8708,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 3528 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 3530 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 3531 @@ -8762,7 +8762,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3549 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3551 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3552 @@ -8794,7 +8794,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3562 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3564 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3565 @@ -8837,7 +8837,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3579 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3581 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3582 @@ -8869,7 +8869,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3592 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3594 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3595 @@ -8901,7 +8901,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3605 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3607 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3608 @@ -8933,7 +8933,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3618 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3620 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3621 @@ -8976,7 +8976,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3635 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3637 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3638 @@ -9019,7 +9019,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3652 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3654 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3655 @@ -9062,7 +9062,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3669 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3671 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3672 @@ -9105,7 +9105,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 3686 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3688 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 3689 @@ -9148,7 +9148,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3703 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3705 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3706 @@ -9187,7 +9187,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3720 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3722 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3723 @@ -9262,7 +9262,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3753 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3755 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3756 @@ -9294,7 +9294,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3766 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3768 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3769 @@ -9337,7 +9337,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3783 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3785 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3786 @@ -9369,7 +9369,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3796 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3798 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3799 @@ -9412,9 +9412,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 3813 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3814 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 3815 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 3816 @@ -9446,7 +9446,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3826 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3828 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3829 @@ -9478,7 +9478,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3839 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3841 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3842 @@ -9521,7 +9521,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3856 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3858 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3859 @@ -9564,7 +9564,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3873 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3875 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3876 @@ -9618,7 +9618,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 3894 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 3896 TRAINER_ENCOUNTER_MUSIC_MALE, #line 3897 @@ -9672,7 +9672,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 3915 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 3917 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 3918 @@ -9704,7 +9704,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 3928 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 3930 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 3931 @@ -9758,7 +9758,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 3949 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 3951 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 3952 @@ -9812,7 +9812,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 3970 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 3972 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 3973 @@ -9866,7 +9866,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 3991 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 3993 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 3994 @@ -9909,7 +9909,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 4008 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 4010 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 4011 @@ -9963,7 +9963,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 4029 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 4031 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 4032 @@ -10017,7 +10017,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 4050 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 4052 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 4053 @@ -10082,7 +10082,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 4075 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 4077 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 4078 @@ -10160,7 +10160,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4104 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4106 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4107 @@ -10196,7 +10196,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4118 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4120 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4121 @@ -10228,7 +10228,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4131 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4133 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4134 @@ -10260,7 +10260,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4144 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4146 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4147 @@ -10292,7 +10292,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4157 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4159 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4160 @@ -10346,7 +10346,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4178 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4180 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4181 @@ -10389,7 +10389,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4195 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4197 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4198 @@ -10421,7 +10421,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4208 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4210 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4211 @@ -10464,7 +10464,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4225 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4227 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4228 @@ -10507,7 +10507,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4242 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4244 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4245 @@ -10550,7 +10550,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4259 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 4261 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4262 @@ -10593,9 +10593,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4276 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4277 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4278 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4279 @@ -10631,9 +10631,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4290 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4291 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4292 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4293 @@ -10665,9 +10665,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4303 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4304 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4305 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4306 @@ -10699,9 +10699,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4316 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4317 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4318 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4319 @@ -10733,9 +10733,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4329 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4330 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4331 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4332 @@ -10789,9 +10789,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4350 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4351 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4352 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4353 @@ -10834,9 +10834,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4367 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4368 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4369 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4370 @@ -10879,9 +10879,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4384 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4385 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4386 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4387 @@ -10924,9 +10924,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4401 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4402 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4403 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4404 @@ -10969,9 +10969,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4418 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4419 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4420 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4421 @@ -11014,9 +11014,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 4435 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 4436 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4437 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 4438 @@ -11059,7 +11059,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4452 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4454 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4455 @@ -11091,7 +11091,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4465 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4467 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4468 @@ -11134,7 +11134,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4482 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4484 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4485 @@ -11166,7 +11166,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4495 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4497 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4498 @@ -11198,7 +11198,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4508 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4510 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4511 @@ -11255,7 +11255,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4533 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4535 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4536 @@ -11311,7 +11311,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 4557 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4559 TRAINER_ENCOUNTER_MUSIC_RICH, #line 4560 @@ -11386,7 +11386,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_ELITE_FOUR, #line 4590 .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY, - .encounterMusic_gender = + .encounterMusic_gender = #line 4592 TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, #line 4593 @@ -11503,9 +11503,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_ELITE_FOUR, #line 4641 .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE, - .encounterMusic_gender = + .encounterMusic_gender = #line 4642 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4643 TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, #line 4644 @@ -11622,9 +11622,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_ELITE_FOUR, #line 4692 .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA, - .encounterMusic_gender = + .encounterMusic_gender = #line 4693 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4694 TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, #line 4695 @@ -11741,7 +11741,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_ELITE_FOUR, #line 4743 .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE, - .encounterMusic_gender = + .encounterMusic_gender = #line 4745 TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, #line 4746 @@ -11858,9 +11858,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4794 .trainerPic = TRAINER_PIC_LEADER_ROXANNE, - .encounterMusic_gender = + .encounterMusic_gender = #line 4795 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4796 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 4797 @@ -11939,7 +11939,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4828 .trainerPic = TRAINER_PIC_LEADER_BRAWLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 4830 TRAINER_ENCOUNTER_MUSIC_MALE, #line 4831 @@ -12018,7 +12018,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4862 .trainerPic = TRAINER_PIC_LEADER_WATTSON, - .encounterMusic_gender = + .encounterMusic_gender = #line 4864 TRAINER_ENCOUNTER_MUSIC_MALE, #line 4865 @@ -12115,9 +12115,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4904 .trainerPic = TRAINER_PIC_LEADER_FLANNERY, - .encounterMusic_gender = + .encounterMusic_gender = #line 4905 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4906 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 4907 @@ -12214,7 +12214,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4946 .trainerPic = TRAINER_PIC_LEADER_NORMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 4948 TRAINER_ENCOUNTER_MUSIC_MALE, #line 4949 @@ -12311,9 +12311,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 4988 .trainerPic = TRAINER_PIC_LEADER_WINONA, - .encounterMusic_gender = + .encounterMusic_gender = #line 4989 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 4990 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 4991 @@ -12428,7 +12428,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 5038 .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, - .encounterMusic_gender = + .encounterMusic_gender = #line 5040 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 5041 @@ -12527,7 +12527,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 5080 .trainerPic = TRAINER_PIC_LEADER_JUAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 5082 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5083 @@ -12642,7 +12642,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5130 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5132 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5133 @@ -12674,7 +12674,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5143 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5145 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5146 @@ -12706,7 +12706,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5156 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5158 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5159 @@ -12760,7 +12760,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5177 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5179 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5180 @@ -12803,7 +12803,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5194 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5196 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5197 @@ -12846,7 +12846,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5211 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5213 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5214 @@ -12889,7 +12889,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5228 .trainerPic = TRAINER_PIC_SCHOOL_KID_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5230 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5231 @@ -12943,9 +12943,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5249 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5250 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5251 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5252 @@ -12977,9 +12977,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5262 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5263 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5264 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5265 @@ -13022,9 +13022,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5279 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5280 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5281 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5282 @@ -13067,9 +13067,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5296 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5297 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5298 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5299 @@ -13112,9 +13112,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5313 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5314 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5315 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5316 @@ -13157,9 +13157,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SCHOOL_KID, #line 5330 .trainerPic = TRAINER_PIC_SCHOOL_KID_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5331 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5332 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 5333 @@ -13202,7 +13202,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5347 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5349 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5350 @@ -13259,7 +13259,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5372 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5374 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5375 @@ -13315,7 +13315,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5396 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5398 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5399 @@ -13371,7 +13371,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5420 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5422 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5423 @@ -13427,7 +13427,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5444 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5446 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5447 @@ -13483,7 +13483,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 5468 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 5470 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5471 @@ -13539,7 +13539,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_WINSTRATE, #line 5492 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5494 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5495 @@ -13586,7 +13586,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5509 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5511 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5512 @@ -13620,7 +13620,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5522 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5524 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5525 @@ -13761,7 +13761,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5579 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5581 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5582 @@ -13795,7 +13795,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5592 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5594 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5595 @@ -13829,7 +13829,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5605 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5607 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5608 @@ -13863,7 +13863,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5618 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5620 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5621 @@ -13897,9 +13897,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_WINSTRATE, #line 5631 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5632 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5633 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5634 @@ -13933,9 +13933,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5644 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5645 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5646 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5647 @@ -13969,9 +13969,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5657 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5658 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5659 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5660 @@ -14031,9 +14031,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5678 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5679 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5680 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5681 @@ -14080,9 +14080,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5695 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5696 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5697 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5698 @@ -14129,9 +14129,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5712 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5713 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5714 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5715 @@ -14178,9 +14178,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5729 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5730 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5731 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5732 @@ -14227,9 +14227,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 5746 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5747 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5748 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 5749 @@ -14276,7 +14276,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5763 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5765 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5766 @@ -14308,7 +14308,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5776 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5778 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5779 @@ -14347,7 +14347,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5793 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5795 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5796 @@ -14386,7 +14386,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5810 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5812 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5813 @@ -14425,7 +14425,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5827 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 5829 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5830 @@ -14464,9 +14464,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_WINSTRATE, #line 5844 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5845 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5846 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5847 @@ -14505,9 +14505,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5861 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5862 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5863 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5864 @@ -14550,9 +14550,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5878 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5879 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5880 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5881 @@ -14595,9 +14595,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5895 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5896 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5897 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5898 @@ -14640,9 +14640,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5912 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5913 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5914 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5915 @@ -14685,9 +14685,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 5929 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 5930 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 5931 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 5932 @@ -14730,7 +14730,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 5946 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 5948 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5949 @@ -14762,7 +14762,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 5959 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 5961 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5962 @@ -14805,7 +14805,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 5976 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 5978 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5979 @@ -14841,7 +14841,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 5990 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 5992 TRAINER_ENCOUNTER_MUSIC_MALE, #line 5993 @@ -14884,7 +14884,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6007 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6009 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6010 @@ -14916,7 +14916,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6020 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6022 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6023 @@ -14973,7 +14973,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 6045 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6047 TRAINER_ENCOUNTER_MUSIC_COOL, #line 6048 @@ -15032,9 +15032,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 6071 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6072 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6073 TRAINER_ENCOUNTER_MUSIC_COOL, #line 6074 @@ -15093,7 +15093,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6097 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6099 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6100 @@ -15125,7 +15125,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6110 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6112 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6113 @@ -15157,7 +15157,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6123 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6125 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6126 @@ -15189,7 +15189,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6136 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6138 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6139 @@ -15232,7 +15232,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6153 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6155 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6156 @@ -15286,7 +15286,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6174 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6176 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6177 @@ -15340,7 +15340,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6195 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6197 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6198 @@ -15383,7 +15383,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6212 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6214 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6215 @@ -15426,7 +15426,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6229 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6231 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6232 @@ -15469,7 +15469,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CHAMPION, #line 6246 .trainerPic = TRAINER_PIC_CHAMPION_WALLACE, - .encounterMusic_gender = + .encounterMusic_gender = #line 6248 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6249 @@ -15604,7 +15604,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6305 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6307 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6308 @@ -15658,7 +15658,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6326 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6328 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6329 @@ -15712,7 +15712,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6347 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6349 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6350 @@ -15766,7 +15766,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6368 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6370 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6371 @@ -15820,7 +15820,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6389 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6391 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6392 @@ -15852,7 +15852,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6402 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6404 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6405 @@ -15917,7 +15917,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6427 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6429 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6430 @@ -15949,7 +15949,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6440 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6442 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6443 @@ -15992,7 +15992,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6457 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6459 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6460 @@ -16024,7 +16024,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6470 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6472 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6473 @@ -16067,7 +16067,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6487 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6489 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6490 @@ -16121,7 +16121,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6508 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6510 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6511 @@ -16186,7 +16186,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6533 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6535 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6536 @@ -16251,7 +16251,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6558 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6560 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6561 @@ -16316,7 +16316,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 6583 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 6585 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 6586 @@ -16403,7 +16403,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6616 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6618 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6619 @@ -16457,7 +16457,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6637 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6639 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6640 @@ -16500,7 +16500,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6654 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6656 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6657 @@ -16532,7 +16532,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6667 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6669 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6670 @@ -16564,7 +16564,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6680 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6682 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6683 @@ -16596,7 +16596,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6693 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6695 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6696 @@ -16628,7 +16628,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6706 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6708 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6709 @@ -16660,9 +16660,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6719 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6720 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6721 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6722 @@ -16694,9 +16694,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6732 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6733 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6734 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6735 @@ -16750,9 +16750,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6753 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6754 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6755 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6756 @@ -16784,9 +16784,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6766 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6767 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6768 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6769 @@ -16818,9 +16818,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6779 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6780 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6781 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6782 @@ -16852,9 +16852,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6792 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6793 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6794 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6795 @@ -16886,7 +16886,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6805 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6807 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6808 @@ -16918,7 +16918,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6818 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6820 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6821 @@ -16950,7 +16950,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6831 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6833 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6834 @@ -16982,7 +16982,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6844 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6846 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6847 @@ -17014,7 +17014,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6857 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6859 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6860 @@ -17046,9 +17046,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6870 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6871 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6872 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6873 @@ -17080,9 +17080,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6883 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6884 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6885 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6886 @@ -17114,9 +17114,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6896 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6897 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6898 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6899 @@ -17148,9 +17148,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6909 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6910 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6911 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6912 @@ -17182,9 +17182,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6922 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 6923 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 6924 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 6925 @@ -17216,7 +17216,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6935 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6937 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 6938 @@ -17259,7 +17259,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 6952 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 6954 TRAINER_ENCOUNTER_MUSIC_MALE, #line 6955 @@ -17302,7 +17302,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6969 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6971 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 6972 @@ -17334,7 +17334,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6982 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 6984 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 6985 @@ -17377,7 +17377,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 6999 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 7001 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7002 @@ -17420,7 +17420,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7016 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 7018 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7019 @@ -17452,7 +17452,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7029 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 7031 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7032 @@ -17484,7 +17484,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7042 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 7044 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7045 @@ -17516,7 +17516,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7055 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 7057 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7058 @@ -17548,9 +17548,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7068 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7069 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7070 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7071 @@ -17582,9 +17582,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7081 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7082 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7083 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7084 @@ -17627,9 +17627,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7098 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7099 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7100 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7101 @@ -17661,9 +17661,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7111 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7112 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7113 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7114 @@ -17695,9 +17695,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7124 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7125 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7126 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7127 @@ -17740,9 +17740,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7141 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7142 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7143 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7144 @@ -17774,9 +17774,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7154 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7155 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7156 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7157 @@ -17808,9 +17808,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7167 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7168 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7169 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7170 @@ -17842,9 +17842,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 7180 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7181 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7182 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 7183 @@ -17876,7 +17876,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7193 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7195 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7196 @@ -17919,7 +17919,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7210 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7212 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7213 @@ -17962,7 +17962,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7227 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7229 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7230 @@ -18005,7 +18005,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7244 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7246 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7247 @@ -18059,7 +18059,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7265 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7267 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7268 @@ -18115,7 +18115,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DRAGON_TAMER, #line 7286 .trainerPic = TRAINER_PIC_DRAGON_TAMER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7288 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7289 @@ -18154,7 +18154,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7303 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7305 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7306 @@ -18186,7 +18186,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7316 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7318 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7319 @@ -18229,7 +18229,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7333 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7335 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7336 @@ -18261,7 +18261,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7346 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7348 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7349 @@ -18315,7 +18315,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7367 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7369 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7370 @@ -18347,7 +18347,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7380 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7382 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7383 @@ -18390,7 +18390,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7397 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7399 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7400 @@ -18433,7 +18433,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7414 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7416 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7417 @@ -18476,7 +18476,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7431 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7433 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7434 @@ -18508,7 +18508,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7444 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7446 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7447 @@ -18562,7 +18562,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7465 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7467 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7468 @@ -18605,7 +18605,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7482 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7484 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7485 @@ -18648,7 +18648,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7499 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7501 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7502 @@ -18691,7 +18691,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7516 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7518 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7519 @@ -18734,7 +18734,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7533 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7535 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7536 @@ -18777,7 +18777,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7550 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7552 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7553 @@ -18820,7 +18820,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 7567 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 7569 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7570 @@ -18852,7 +18852,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7580 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7582 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7583 @@ -18884,7 +18884,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7593 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7595 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7596 @@ -18927,9 +18927,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 7610 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7611 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7612 TRAINER_ENCOUNTER_MUSIC_COOL, #line 7613 @@ -18982,9 +18982,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 7631 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 7632 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7633 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 7634 @@ -19014,7 +19014,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7643 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7645 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7646 @@ -19087,7 +19087,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7675 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7677 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7678 @@ -19128,7 +19128,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7691 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7693 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7694 @@ -19216,7 +19216,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7728 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7730 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7731 @@ -19304,7 +19304,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7765 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7767 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7768 @@ -19390,7 +19390,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 7800 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7802 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 7803 @@ -19480,9 +19480,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7837 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7838 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7839 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7840 @@ -19514,9 +19514,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7850 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7851 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7852 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7853 @@ -19548,9 +19548,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7863 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7864 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7865 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7866 @@ -19593,9 +19593,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7880 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7881 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7882 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7883 @@ -19627,9 +19627,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7893 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7894 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7895 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7896 @@ -19661,9 +19661,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7906 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7907 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7908 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7909 @@ -19706,9 +19706,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7923 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7924 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7925 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7926 @@ -19751,9 +19751,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7940 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7941 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7942 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7943 @@ -19796,9 +19796,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 7957 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 7958 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7959 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 7960 @@ -19841,9 +19841,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 7974 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7975 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7976 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 7977 @@ -19882,9 +19882,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 7991 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 7992 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 7993 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 7994 @@ -19927,9 +19927,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 8008 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 8009 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8010 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 8011 @@ -19968,9 +19968,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 8025 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 8026 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8027 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 8028 @@ -20009,9 +20009,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 8042 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 8043 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8044 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 8045 @@ -20050,9 +20050,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 8059 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 8060 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8061 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 8062 @@ -20109,9 +20109,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 8084 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 8085 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8086 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 8087 @@ -20168,9 +20168,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8109 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8110 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8111 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8112 @@ -20213,9 +20213,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8126 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8127 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8128 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8129 @@ -20247,9 +20247,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8139 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8140 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8141 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8142 @@ -20281,9 +20281,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8152 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8153 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8154 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8155 @@ -20326,9 +20326,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8169 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8170 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8171 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8172 @@ -20360,9 +20360,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8182 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8183 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8184 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8185 @@ -20405,9 +20405,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8199 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8200 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8201 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8202 @@ -20439,9 +20439,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8212 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8213 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8214 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8215 @@ -20495,9 +20495,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8233 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8234 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8235 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8236 @@ -20529,9 +20529,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8246 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8247 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8248 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8249 @@ -20563,9 +20563,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8259 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8260 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8261 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8262 @@ -20597,9 +20597,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8272 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8273 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8274 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8275 @@ -20631,9 +20631,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8285 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8286 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8287 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8288 @@ -20676,9 +20676,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8302 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8303 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8304 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8305 @@ -20710,9 +20710,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8315 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8316 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8317 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8318 @@ -20755,9 +20755,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8332 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8333 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8334 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8335 @@ -20789,9 +20789,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8345 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8346 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8347 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8348 @@ -20823,9 +20823,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8358 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8359 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8360 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8361 @@ -20857,9 +20857,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8371 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8372 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8373 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8374 @@ -20902,9 +20902,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8388 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8389 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8390 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8391 @@ -20936,9 +20936,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8401 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8402 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8403 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8404 @@ -20981,9 +20981,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8418 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8419 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8420 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8421 @@ -21026,9 +21026,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8435 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8436 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8437 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8438 @@ -21071,9 +21071,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8452 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8453 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8454 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8455 @@ -21105,9 +21105,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8465 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8466 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8467 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8468 @@ -21139,9 +21139,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8478 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8479 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8480 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8481 @@ -21173,9 +21173,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8491 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8492 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8493 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8494 @@ -21218,9 +21218,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 8508 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 8509 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8510 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 8511 @@ -21274,9 +21274,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8529 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8530 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8531 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8532 @@ -21333,9 +21333,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8554 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8555 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8556 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8557 @@ -21392,9 +21392,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8579 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8580 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8581 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8582 @@ -21437,9 +21437,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8596 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8597 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8598 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8599 @@ -21482,9 +21482,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8613 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8614 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8615 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8616 @@ -21527,9 +21527,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8630 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8631 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8632 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8633 @@ -21583,7 +21583,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 8651 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 8653 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 8654 @@ -21622,9 +21622,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8668 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8669 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8670 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8671 @@ -21667,9 +21667,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8685 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8686 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8687 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8688 @@ -21723,9 +21723,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8706 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8707 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8708 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8709 @@ -21779,9 +21779,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8727 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8728 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8729 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8730 @@ -21835,9 +21835,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 8748 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 8749 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 8750 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 8751 @@ -21891,7 +21891,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8769 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8771 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8772 @@ -21934,7 +21934,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8786 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8788 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8789 @@ -21977,7 +21977,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8803 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8805 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8806 @@ -22020,7 +22020,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8820 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8822 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8823 @@ -22063,7 +22063,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8837 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8839 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8840 @@ -22106,7 +22106,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8854 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8856 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8857 @@ -22159,7 +22159,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8875 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8877 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8878 @@ -22202,7 +22202,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8892 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8894 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8895 @@ -22259,7 +22259,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 8917 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 8919 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 8920 @@ -22316,7 +22316,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 8942 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 8944 TRAINER_ENCOUNTER_MUSIC_MALE, #line 8945 @@ -22359,7 +22359,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 8959 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 8961 TRAINER_ENCOUNTER_MUSIC_MALE, #line 8962 @@ -22391,7 +22391,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 8972 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 8974 TRAINER_ENCOUNTER_MUSIC_MALE, #line 8975 @@ -22434,7 +22434,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 8989 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 8991 TRAINER_ENCOUNTER_MUSIC_MALE, #line 8992 @@ -22488,7 +22488,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9010 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9012 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9013 @@ -22531,7 +22531,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9027 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9029 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9030 @@ -22585,7 +22585,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9048 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9050 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9051 @@ -22628,7 +22628,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9065 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9067 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9068 @@ -22682,7 +22682,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9086 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9088 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9089 @@ -22736,7 +22736,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9107 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9109 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9110 @@ -22790,7 +22790,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9128 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9130 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9131 @@ -22844,7 +22844,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 9149 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 9151 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 9152 @@ -22876,9 +22876,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 9162 .trainerPic = TRAINER_PIC_POKEFAN_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 9163 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9164 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 9165 @@ -22939,9 +22939,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER_2, #line 9187 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 9188 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9189 TRAINER_ENCOUNTER_MUSIC_COOL, #line 9190 @@ -22975,7 +22975,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 9201 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9203 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9204 @@ -23014,9 +23014,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 9218 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9219 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9220 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9221 @@ -23055,7 +23055,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 9235 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9237 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 9238 @@ -23098,7 +23098,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9252 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9254 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9255 @@ -23141,9 +23141,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 9269 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 9270 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9271 TRAINER_ENCOUNTER_MUSIC_COOL, #line 9272 @@ -23184,9 +23184,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 9287 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 9288 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9289 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 9290 @@ -23229,7 +23229,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 9304 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9306 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9307 @@ -23261,7 +23261,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 9317 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9319 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 9320 @@ -23304,7 +23304,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9334 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9336 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9337 @@ -23347,7 +23347,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9351 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9353 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9354 @@ -23390,7 +23390,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, #line 9368 .trainerPic = TRAINER_PIC_MAGMA_ADMIN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9370 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 9371 @@ -23444,7 +23444,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9389 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9391 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9392 @@ -23487,7 +23487,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9406 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9408 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9409 @@ -23530,7 +23530,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9423 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9425 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9426 @@ -23573,7 +23573,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COLLECTOR, #line 9440 .trainerPic = TRAINER_PIC_COLLECTOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 9442 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 9443 @@ -23616,7 +23616,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9457 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9459 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9460 @@ -23729,7 +23729,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9507 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9509 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9510 @@ -23761,7 +23761,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9520 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9522 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9523 @@ -23815,7 +23815,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9541 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9543 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9544 @@ -23869,7 +23869,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9562 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9564 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9565 @@ -23901,7 +23901,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9575 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9577 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9578 @@ -23955,7 +23955,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9596 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9598 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9599 @@ -24009,7 +24009,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9617 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9619 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9620 @@ -24041,7 +24041,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9630 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9632 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9633 @@ -24095,7 +24095,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9651 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 9653 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9654 @@ -24149,9 +24149,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9672 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9673 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9674 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9675 @@ -24183,9 +24183,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9685 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9686 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9687 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9688 @@ -24239,9 +24239,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9706 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9707 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9708 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9709 @@ -24295,9 +24295,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9727 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9728 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9729 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9730 @@ -24329,9 +24329,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9740 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9741 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9742 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9743 @@ -24385,9 +24385,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9761 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9762 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9763 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9764 @@ -24441,9 +24441,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9782 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9783 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9784 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9785 @@ -24475,9 +24475,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9795 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9796 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9797 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9798 @@ -24531,9 +24531,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 9816 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 9817 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 9818 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 9819 @@ -24587,7 +24587,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 9837 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9839 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9840 @@ -24674,7 +24674,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 9870 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 9872 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9873 @@ -24706,7 +24706,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 9883 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9885 TRAINER_ENCOUNTER_MUSIC_COOL, #line 9886 @@ -24763,7 +24763,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 9908 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9910 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9911 @@ -24850,7 +24850,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 9941 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9943 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9944 @@ -24937,7 +24937,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 9974 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 9976 TRAINER_ENCOUNTER_MUSIC_MALE, #line 9977 @@ -25024,7 +25024,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10007 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10009 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10010 @@ -25111,9 +25111,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10040 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10041 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10042 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10043 @@ -25200,9 +25200,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 10073 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10074 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10075 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10076 @@ -25247,7 +25247,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 10091 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 10093 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 10094 @@ -25279,9 +25279,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10104 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10105 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10106 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10107 @@ -25368,9 +25368,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10137 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10138 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10139 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10140 @@ -25457,9 +25457,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10170 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10171 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10172 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10173 @@ -25546,9 +25546,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 10203 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10204 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10205 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10206 @@ -25635,7 +25635,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10236 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10238 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10239 @@ -25669,7 +25669,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10250 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10252 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10253 @@ -25725,7 +25725,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10272 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10274 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10275 @@ -25759,7 +25759,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10286 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10288 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10289 @@ -25793,7 +25793,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10300 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10302 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10303 @@ -25827,7 +25827,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10314 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10316 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10317 @@ -25861,7 +25861,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10328 .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10330 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10331 @@ -25906,9 +25906,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10346 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10347 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10348 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10349 @@ -25953,9 +25953,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10364 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10365 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10366 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10367 @@ -26011,9 +26011,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10386 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10387 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10388 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10389 @@ -26058,9 +26058,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10404 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10405 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10406 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10407 @@ -26105,9 +26105,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10422 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10423 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10424 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10425 @@ -26152,9 +26152,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10440 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10441 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10442 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10443 @@ -26199,9 +26199,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_RANGER, #line 10458 .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10459 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10460 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10461 @@ -26246,7 +26246,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 10476 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10478 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10479 @@ -26278,7 +26278,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 10489 .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10491 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 10492 @@ -26321,9 +26321,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10506 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10507 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10508 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 10509 @@ -26366,9 +26366,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 10523 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10524 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10525 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 10526 @@ -26411,7 +26411,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10540 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10542 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10543 @@ -26454,7 +26454,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 10557 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 10559 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 10560 @@ -26497,7 +26497,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 10574 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 10576 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10577 @@ -26529,9 +26529,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 10587 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 10588 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10589 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10590 @@ -26563,7 +26563,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 10600 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 10602 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10603 @@ -26595,9 +26595,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 10613 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 10614 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10615 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 10616 @@ -26629,7 +26629,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 10626 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10628 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 10629 @@ -26661,9 +26661,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 10639 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10640 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10641 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10642 @@ -26719,7 +26719,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 10662 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10664 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 10665 @@ -26751,7 +26751,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10675 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10677 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10678 @@ -26783,7 +26783,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 10688 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10690 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 10691 @@ -26815,9 +26815,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 10701 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10702 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10703 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10704 @@ -26849,7 +26849,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 10714 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10716 TRAINER_ENCOUNTER_MUSIC_RICH, #line 10717 @@ -26881,9 +26881,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HEX_MANIAC, #line 10727 .trainerPic = TRAINER_PIC_HEX_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 10728 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10729 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 10730 @@ -26915,7 +26915,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 10740 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10742 TRAINER_ENCOUNTER_MUSIC_RICH, #line 10743 @@ -26947,7 +26947,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 10753 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10755 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10756 @@ -26979,9 +26979,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10766 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10767 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10768 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10769 @@ -27024,7 +27024,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10783 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10785 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10786 @@ -27056,7 +27056,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10796 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10798 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10799 @@ -27088,7 +27088,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10809 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10811 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10812 @@ -27120,7 +27120,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 10822 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10824 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10825 @@ -27152,9 +27152,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 10835 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10836 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10837 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10838 @@ -27186,7 +27186,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 10848 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10850 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10851 @@ -27229,7 +27229,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 10865 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10867 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10868 @@ -27272,7 +27272,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 10882 .trainerPic = TRAINER_PIC_EXPERT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10884 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 10885 @@ -27315,9 +27315,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 10899 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10900 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10901 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 10902 @@ -27349,9 +27349,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_AQUA, #line 10912 .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 10913 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10914 TRAINER_ENCOUNTER_MUSIC_AQUA, #line 10915 @@ -27394,7 +27394,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, #line 10929 .trainerPic = TRAINER_PIC_MAGMA_ADMIN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10931 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 10932 @@ -27459,7 +27459,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 10954 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 10956 TRAINER_ENCOUNTER_MUSIC_COOL, #line 10957 @@ -27504,7 +27504,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 10972 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 10974 TRAINER_ENCOUNTER_MUSIC_MALE, #line 10975 @@ -27547,9 +27547,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 10989 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 10990 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 10991 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 10992 @@ -27592,7 +27592,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_LEADER, #line 11006 .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11008 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 11009 @@ -27648,7 +27648,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_LEADER, #line 11028 .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11030 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 11031 @@ -27704,9 +27704,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11050 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11051 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11052 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11053 @@ -27749,9 +27749,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11067 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11068 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11069 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11070 @@ -27794,9 +27794,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11084 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11085 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11086 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11087 @@ -27828,9 +27828,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_WINSTRATE, #line 11097 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11098 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11099 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11100 @@ -27884,9 +27884,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11118 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11119 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11120 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11121 @@ -27929,9 +27929,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11135 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11136 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11137 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11138 @@ -27974,9 +27974,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11152 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11153 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11154 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11155 @@ -28019,9 +28019,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11169 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11170 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11171 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11172 @@ -28075,9 +28075,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11190 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11191 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11192 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11193 @@ -28109,9 +28109,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11203 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11204 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11205 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11206 @@ -28165,9 +28165,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11224 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11225 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11226 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11227 @@ -28199,9 +28199,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LASS, #line 11237 .trainerPic = TRAINER_PIC_LASS, - .encounterMusic_gender = + .encounterMusic_gender = #line 11238 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11239 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11240 @@ -28244,7 +28244,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11254 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11256 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11257 @@ -28287,7 +28287,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11271 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11273 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11274 @@ -28352,7 +28352,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11296 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11298 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11299 @@ -28395,7 +28395,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11313 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11315 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11316 @@ -28438,7 +28438,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11330 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11332 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11333 @@ -28481,7 +28481,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11347 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11349 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11350 @@ -28513,7 +28513,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11360 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11362 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11363 @@ -28556,7 +28556,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11377 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11379 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11380 @@ -28588,7 +28588,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11390 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11392 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11393 @@ -28631,7 +28631,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11407 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11409 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11410 @@ -28685,7 +28685,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_CATCHER, #line 11428 .trainerPic = TRAINER_PIC_BUG_CATCHER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11430 TRAINER_ENCOUNTER_MUSIC_MALE, #line 11431 @@ -28750,7 +28750,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11453 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11455 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11456 @@ -28793,7 +28793,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11470 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11472 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11473 @@ -28847,7 +28847,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11491 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11493 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11494 @@ -28890,7 +28890,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11508 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11510 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11511 @@ -28933,7 +28933,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11525 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11527 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11528 @@ -28987,7 +28987,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11546 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11548 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11549 @@ -29019,7 +29019,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11559 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11561 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11562 @@ -29062,7 +29062,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11576 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11578 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11579 @@ -29099,7 +29099,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11591 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11593 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11594 @@ -29152,7 +29152,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11612 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11614 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11615 @@ -29206,7 +29206,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11633 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11635 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11636 @@ -29271,7 +29271,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11658 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11660 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11661 @@ -29336,7 +29336,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11683 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11685 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11686 @@ -29401,7 +29401,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 11708 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 11710 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 11711 @@ -29466,7 +29466,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11733 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11735 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11736 @@ -29509,7 +29509,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11750 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11752 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11753 @@ -29552,7 +29552,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11767 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11769 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11770 @@ -29595,7 +29595,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11784 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11786 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11787 @@ -29638,7 +29638,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11801 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11803 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11804 @@ -29681,7 +29681,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11818 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11820 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11821 @@ -29724,7 +29724,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 11835 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 11837 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 11838 @@ -29767,9 +29767,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 11852 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 11853 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11854 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 11855 @@ -29801,7 +29801,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 11865 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 11867 TRAINER_ENCOUNTER_MUSIC_COOL, #line 11868 @@ -29842,9 +29842,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 11883 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 11884 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11885 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 11886 @@ -29901,9 +29901,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 11908 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 11909 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 11910 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 11911 @@ -29942,7 +29942,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 11925 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 11927 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 11928 @@ -29999,7 +29999,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 11950 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 11952 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 11953 @@ -30056,7 +30056,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 11975 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 11977 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 11978 @@ -30113,7 +30113,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 12000 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 12002 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12003 @@ -30156,9 +30156,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 12017 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 12018 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12019 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 12020 @@ -30212,7 +30212,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12038 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12040 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12041 @@ -30244,7 +30244,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12051 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12053 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12054 @@ -30357,7 +30357,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12101 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12103 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12104 @@ -30470,7 +30470,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12151 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12153 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12154 @@ -30583,7 +30583,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12201 .trainerPic = TRAINER_PIC_WALLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12203 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12204 @@ -30696,7 +30696,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12251 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12253 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12254 @@ -30761,7 +30761,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12276 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12278 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12279 @@ -30826,7 +30826,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12301 .trainerPic = TRAINER_PIC_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12303 TRAINER_ENCOUNTER_MUSIC_MALE, #line 12304 @@ -30891,9 +30891,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12326 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12327 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12328 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 12329 @@ -30958,9 +30958,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12351 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12352 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12353 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 12354 @@ -31025,9 +31025,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 12376 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12377 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12378 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 12379 @@ -31092,7 +31092,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12401 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12403 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12404 @@ -31146,7 +31146,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12422 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12424 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12425 @@ -31189,7 +31189,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12439 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12441 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12442 @@ -31243,9 +31243,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 12460 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 12461 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12462 TRAINER_ENCOUNTER_MUSIC_COOL, #line 12463 @@ -31290,7 +31290,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 12478 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 12480 TRAINER_ENCOUNTER_MUSIC_COOL, #line 12481 @@ -31335,7 +31335,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 12496 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 12498 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12499 @@ -31367,7 +31367,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12509 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12511 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12512 @@ -31421,7 +31421,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 12530 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 12532 TRAINER_ENCOUNTER_MUSIC_COOL, #line 12533 @@ -31464,7 +31464,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 12547 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 12549 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12550 @@ -31507,9 +31507,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 12564 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 12565 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12566 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12567 @@ -31541,7 +31541,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TWINS, #line 12577 .trainerPic = TRAINER_PIC_TWINS, - .encounterMusic_gender = + .encounterMusic_gender = #line 12579 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 12580 @@ -31584,7 +31584,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 12594 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 12596 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 12597 @@ -31641,7 +31641,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SR_AND_JR, #line 12619 .trainerPic = TRAINER_PIC_SR_AND_JR, - .encounterMusic_gender = + .encounterMusic_gender = #line 12621 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 12622 @@ -31698,7 +31698,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, #line 12644 .trainerPic = TRAINER_PIC_YOUNG_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12646 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 12647 @@ -31755,7 +31755,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_OLD_COUPLE, #line 12669 .trainerPic = TRAINER_PIC_OLD_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12671 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12672 @@ -31812,7 +31812,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_OLD_COUPLE, #line 12694 .trainerPic = TRAINER_PIC_OLD_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12696 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12697 @@ -31869,7 +31869,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_OLD_COUPLE, #line 12719 .trainerPic = TRAINER_PIC_OLD_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12721 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12722 @@ -31926,7 +31926,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_OLD_COUPLE, #line 12744 .trainerPic = TRAINER_PIC_OLD_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12746 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12747 @@ -31983,7 +31983,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_OLD_COUPLE, #line 12769 .trainerPic = TRAINER_PIC_OLD_COUPLE, - .encounterMusic_gender = + .encounterMusic_gender = #line 12771 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 12772 @@ -32040,7 +32040,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12794 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12796 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12797 @@ -32083,7 +32083,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12811 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12813 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12814 @@ -32126,7 +32126,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12828 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12830 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12831 @@ -32169,7 +32169,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12845 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12847 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12848 @@ -32212,7 +32212,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12862 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12864 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12865 @@ -32255,7 +32255,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12879 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12881 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12882 @@ -32298,7 +32298,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SIS_AND_BRO, #line 12896 .trainerPic = TRAINER_PIC_SIS_AND_BRO, - .encounterMusic_gender = + .encounterMusic_gender = #line 12898 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 12899 @@ -32341,7 +32341,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12913 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12915 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12916 @@ -32406,7 +32406,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RICH_BOY, #line 12938 .trainerPic = TRAINER_PIC_RICH_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12940 TRAINER_ENCOUNTER_MUSIC_RICH, #line 12941 @@ -32451,9 +32451,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LADY, #line 12955 .trainerPic = TRAINER_PIC_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 12956 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12957 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 12958 @@ -32500,7 +32500,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 12973 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 12975 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 12976 @@ -32532,9 +32532,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_F, #line 12986 .trainerPic = TRAINER_PIC_TUBER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 12987 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 12988 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 12989 @@ -32566,7 +32566,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TUBER_M, #line 12999 .trainerPic = TRAINER_PIC_TUBER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13001 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13002 @@ -32609,7 +32609,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEFAN, #line 13016 .trainerPic = TRAINER_PIC_POKEFAN_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13018 TRAINER_ENCOUNTER_MUSIC_TWINS, #line 13019 @@ -32656,7 +32656,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 13033 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 13035 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13036 @@ -32699,9 +32699,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 13050 .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13051 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13052 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13053 @@ -32733,7 +32733,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 13063 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 13065 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13066 @@ -32765,7 +32765,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 13076 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 13078 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13079 @@ -32797,7 +32797,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 13089 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13091 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13092 @@ -32829,9 +32829,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 13102 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 13103 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13104 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13105 @@ -32863,9 +32863,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 13115 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13116 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13117 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13118 @@ -32897,7 +32897,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 13128 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13130 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13131 @@ -32929,9 +32929,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 13141 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13142 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13143 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13144 @@ -32974,7 +32974,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 13158 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13160 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13161 @@ -33017,7 +33017,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 13175 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13177 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13178 @@ -33060,7 +33060,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_POKEMANIAC, #line 13192 .trainerPic = TRAINER_PIC_POKEMANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 13194 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 13195 @@ -33103,9 +33103,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 13209 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13210 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13211 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13212 @@ -33148,7 +33148,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FISHERMAN, #line 13226 .trainerPic = TRAINER_PIC_FISHERMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 13228 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13229 @@ -33180,9 +33180,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 13239 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13240 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13241 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13242 @@ -33214,7 +33214,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 13252 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13254 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13255 @@ -33268,7 +33268,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13273 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13275 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13276 @@ -33300,7 +33300,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13286 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13288 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13289 @@ -33332,7 +33332,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13299 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13301 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13302 @@ -33364,7 +33364,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13312 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13314 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13315 @@ -33407,7 +33407,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13329 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13331 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13332 @@ -33450,7 +33450,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13346 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13348 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13349 @@ -33482,7 +33482,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13359 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13361 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13362 @@ -33514,7 +33514,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13372 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13374 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13375 @@ -33546,7 +33546,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13385 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13387 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13388 @@ -33578,7 +33578,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13398 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13400 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13401 @@ -33610,7 +33610,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13411 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13413 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13414 @@ -33642,7 +33642,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13424 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13426 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13427 @@ -33674,7 +33674,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13437 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13439 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13440 @@ -33706,9 +33706,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13450 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13451 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13452 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13453 @@ -33740,9 +33740,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13463 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13464 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13465 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13466 @@ -33774,9 +33774,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TEAM_MAGMA, #line 13476 .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13477 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13478 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13479 @@ -33808,7 +33808,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, #line 13489 .trainerPic = TRAINER_PIC_MAGMA_ADMIN, - .encounterMusic_gender = + .encounterMusic_gender = #line 13491 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13492 @@ -33873,9 +33873,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 13514 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13515 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13516 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13517 @@ -33920,7 +33920,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_MAGMA_LEADER, #line 13532 .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, - .encounterMusic_gender = + .encounterMusic_gender = #line 13534 TRAINER_ENCOUNTER_MUSIC_MAGMA, #line 13535 @@ -33974,7 +33974,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_M, #line 13553 .trainerPic = TRAINER_PIC_SWIMMER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13555 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 13556 @@ -34006,9 +34006,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SWIMMER_F, #line 13566 .trainerPic = TRAINER_PIC_SWIMMER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13567 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13568 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 13569 @@ -34040,7 +34040,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 13579 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 13581 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13582 @@ -34083,7 +34083,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 13596 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13598 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13599 @@ -34126,7 +34126,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 13613 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13615 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 13616 @@ -34158,7 +34158,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 13626 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 13628 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13629 @@ -34212,9 +34212,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 13647 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13648 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13649 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13650 @@ -34270,7 +34270,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 13669 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13671 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13672 @@ -34313,9 +34313,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PICNICKER, #line 13686 .trainerPic = TRAINER_PIC_PICNICKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13687 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13688 TRAINER_ENCOUNTER_MUSIC_GIRL, #line 13689 @@ -34358,7 +34358,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 13703 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 13705 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13706 @@ -34401,7 +34401,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_CAMPER, #line 13720 .trainerPic = TRAINER_PIC_CAMPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13722 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13723 @@ -34444,7 +34444,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 13737 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13739 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13740 @@ -34487,9 +34487,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_AROMA_LADY, #line 13754 .trainerPic = TRAINER_PIC_AROMA_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 13755 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13756 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13757 @@ -34532,9 +34532,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 13771 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13772 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13773 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13774 @@ -34577,7 +34577,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_NINJA_BOY, #line 13788 .trainerPic = TRAINER_PIC_NINJA_BOY, - .encounterMusic_gender = + .encounterMusic_gender = #line 13790 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 13791 @@ -34620,9 +34620,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 13805 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13806 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13807 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13808 @@ -34665,9 +34665,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 13822 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 13823 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13824 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13825 @@ -34710,9 +34710,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 13839 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13840 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13841 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13842 @@ -34755,7 +34755,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 13856 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13858 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13859 @@ -34798,7 +34798,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_YOUNGSTER, #line 13873 .trainerPic = TRAINER_PIC_YOUNGSTER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13875 TRAINER_ENCOUNTER_MUSIC_MALE, #line 13876 @@ -34841,9 +34841,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 13890 .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13891 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13892 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13893 @@ -34875,9 +34875,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 13903 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13904 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13905 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13906 @@ -34909,9 +34909,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 13916 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 13917 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13918 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13919 @@ -34943,9 +34943,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_EXPERT, #line 13929 .trainerPic = TRAINER_PIC_EXPERT_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 13930 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13931 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13932 @@ -34990,7 +34990,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 13947 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 13949 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 13950 @@ -35022,7 +35022,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_KINDLER, #line 13960 .trainerPic = TRAINER_PIC_KINDLER, - .encounterMusic_gender = + .encounterMusic_gender = #line 13962 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 13963 @@ -35065,9 +35065,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PARASOL_LADY, #line 13977 .trainerPic = TRAINER_PIC_PARASOL_LADY, - .encounterMusic_gender = + .encounterMusic_gender = #line 13978 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 13979 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 13980 @@ -35099,7 +35099,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 13990 .trainerPic = TRAINER_PIC_COOLTRAINER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 13992 TRAINER_ENCOUNTER_MUSIC_COOL, #line 13993 @@ -35139,9 +35139,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BATTLE_GIRL, #line 14007 .trainerPic = TRAINER_PIC_BATTLE_GIRL, - .encounterMusic_gender = + .encounterMusic_gender = #line 14008 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14009 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 14010 @@ -35184,7 +35184,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 14024 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 14026 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 14027 @@ -35227,7 +35227,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 14041 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 14043 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14044 @@ -35314,9 +35314,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 14074 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 14075 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14076 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14077 @@ -35403,9 +35403,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 14107 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 14108 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14109 TRAINER_ENCOUNTER_MUSIC_COOL, #line 14110 @@ -35450,9 +35450,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 14125 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14126 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14127 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14128 @@ -35495,9 +35495,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 14142 .trainerPic = TRAINER_PIC_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14143 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14144 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14145 @@ -35540,9 +35540,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14159 .trainerPic = TRAINER_PIC_LEADER_ROXANNE, - .encounterMusic_gender = + .encounterMusic_gender = #line 14160 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14161 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14162 @@ -35641,9 +35641,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14201 .trainerPic = TRAINER_PIC_LEADER_ROXANNE, - .encounterMusic_gender = + .encounterMusic_gender = #line 14202 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14203 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14204 @@ -35760,9 +35760,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14251 .trainerPic = TRAINER_PIC_LEADER_ROXANNE, - .encounterMusic_gender = + .encounterMusic_gender = #line 14252 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14253 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14254 @@ -35879,9 +35879,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14301 .trainerPic = TRAINER_PIC_LEADER_ROXANNE, - .encounterMusic_gender = + .encounterMusic_gender = #line 14302 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14303 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14304 @@ -36016,7 +36016,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14359 .trainerPic = TRAINER_PIC_LEADER_BRAWLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14361 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14362 @@ -36115,7 +36115,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14401 .trainerPic = TRAINER_PIC_LEADER_BRAWLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14403 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14404 @@ -36214,7 +36214,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14443 .trainerPic = TRAINER_PIC_LEADER_BRAWLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14445 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14446 @@ -36331,7 +36331,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14493 .trainerPic = TRAINER_PIC_LEADER_BRAWLY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14495 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14496 @@ -36466,7 +36466,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14551 .trainerPic = TRAINER_PIC_LEADER_WATTSON, - .encounterMusic_gender = + .encounterMusic_gender = #line 14553 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14554 @@ -36565,7 +36565,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14593 .trainerPic = TRAINER_PIC_LEADER_WATTSON, - .encounterMusic_gender = + .encounterMusic_gender = #line 14595 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14596 @@ -36682,7 +36682,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14643 .trainerPic = TRAINER_PIC_LEADER_WATTSON, - .encounterMusic_gender = + .encounterMusic_gender = #line 14645 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14646 @@ -36799,7 +36799,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14693 .trainerPic = TRAINER_PIC_LEADER_WATTSON, - .encounterMusic_gender = + .encounterMusic_gender = #line 14695 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14696 @@ -36934,9 +36934,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14751 .trainerPic = TRAINER_PIC_LEADER_FLANNERY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14752 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14753 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14754 @@ -37037,9 +37037,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14793 .trainerPic = TRAINER_PIC_LEADER_FLANNERY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14794 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14795 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14796 @@ -37158,9 +37158,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14843 .trainerPic = TRAINER_PIC_LEADER_FLANNERY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14844 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14845 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14846 @@ -37297,9 +37297,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14901 .trainerPic = TRAINER_PIC_LEADER_FLANNERY, - .encounterMusic_gender = + .encounterMusic_gender = #line 14902 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 14903 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 14904 @@ -37436,7 +37436,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 14959 .trainerPic = TRAINER_PIC_LEADER_NORMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 14961 TRAINER_ENCOUNTER_MUSIC_MALE, #line 14962 @@ -37535,7 +37535,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15001 .trainerPic = TRAINER_PIC_LEADER_NORMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15003 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15004 @@ -37652,7 +37652,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15051 .trainerPic = TRAINER_PIC_LEADER_NORMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15053 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15054 @@ -37769,7 +37769,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15101 .trainerPic = TRAINER_PIC_LEADER_NORMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15103 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15104 @@ -37904,9 +37904,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15159 .trainerPic = TRAINER_PIC_LEADER_WINONA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15160 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15161 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15162 @@ -38023,9 +38023,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15209 .trainerPic = TRAINER_PIC_LEADER_WINONA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15210 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15211 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15212 @@ -38160,9 +38160,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15267 .trainerPic = TRAINER_PIC_LEADER_WINONA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15268 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15269 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15270 @@ -38297,9 +38297,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15325 .trainerPic = TRAINER_PIC_LEADER_WINONA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15326 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15327 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15328 @@ -38434,7 +38434,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15383 .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15385 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15386 @@ -38553,7 +38553,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15433 .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15435 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15436 @@ -38690,7 +38690,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15491 .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15493 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15494 @@ -38827,7 +38827,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15549 .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15551 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 15552 @@ -38964,7 +38964,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15607 .trainerPic = TRAINER_PIC_LEADER_JUAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15609 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15610 @@ -39081,7 +39081,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15657 .trainerPic = TRAINER_PIC_LEADER_JUAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15659 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15660 @@ -39198,7 +39198,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15707 .trainerPic = TRAINER_PIC_LEADER_JUAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15709 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15710 @@ -39333,7 +39333,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_LEADER, #line 15765 .trainerPic = TRAINER_PIC_LEADER_JUAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15767 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15768 @@ -39468,7 +39468,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BUG_MANIAC, #line 15823 .trainerPic = TRAINER_PIC_BUG_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 15825 TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, #line 15826 @@ -39523,7 +39523,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BIRD_KEEPER, #line 15846 .trainerPic = TRAINER_PIC_BIRD_KEEPER, - .encounterMusic_gender = + .encounterMusic_gender = #line 15848 TRAINER_ENCOUNTER_MUSIC_COOL, #line 15849 @@ -39555,7 +39555,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 15859 .trainerPic = TRAINER_PIC_STEVEN, - .encounterMusic_gender = + .encounterMusic_gender = #line 15861 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15862 @@ -39688,9 +39688,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SALON_MAIDEN, #line 15917 .trainerPic = TRAINER_PIC_SALON_MAIDEN_ANABEL, - .encounterMusic_gender = + .encounterMusic_gender = #line 15918 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15919 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15920 @@ -39722,7 +39722,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_DOME_ACE, #line 15930 .trainerPic = TRAINER_PIC_DOME_ACE_TUCKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 15932 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15933 @@ -39754,7 +39754,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PALACE_MAVEN, #line 15943 .trainerPic = TRAINER_PIC_PALACE_MAVEN_SPENSER, - .encounterMusic_gender = + .encounterMusic_gender = #line 15945 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15946 @@ -39786,9 +39786,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_ARENA_TYCOON, #line 15956 .trainerPic = TRAINER_PIC_ARENA_TYCOON_GRETA, - .encounterMusic_gender = + .encounterMusic_gender = #line 15957 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15958 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15959 @@ -39820,7 +39820,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_FACTORY_HEAD, #line 15969 .trainerPic = TRAINER_PIC_FACTORY_HEAD_NOLAND, - .encounterMusic_gender = + .encounterMusic_gender = #line 15971 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15972 @@ -39852,9 +39852,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PIKE_QUEEN, #line 15982 .trainerPic = TRAINER_PIC_PIKE_QUEEN_LUCY, - .encounterMusic_gender = + .encounterMusic_gender = #line 15983 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 15984 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15985 @@ -39886,7 +39886,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PYRAMID_KING, #line 15995 .trainerPic = TRAINER_PIC_PYRAMID_KING_BRANDON, - .encounterMusic_gender = + .encounterMusic_gender = #line 15997 TRAINER_ENCOUNTER_MUSIC_MALE, #line 15998 @@ -39918,7 +39918,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 16008 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 16010 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16011 @@ -39961,7 +39961,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 16025 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 16027 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16028 @@ -40015,7 +40015,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 16046 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 16048 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16049 @@ -40069,7 +40069,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RUIN_MANIAC, #line 16067 .trainerPic = TRAINER_PIC_RUIN_MANIAC, - .encounterMusic_gender = + .encounterMusic_gender = #line 16069 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16070 @@ -40123,7 +40123,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 16088 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 16090 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16091 @@ -40177,7 +40177,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 16109 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 16111 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16112 @@ -40231,7 +40231,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 16130 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 16132 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16133 @@ -40285,7 +40285,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_SAILOR, #line 16151 .trainerPic = TRAINER_PIC_SAILOR, - .encounterMusic_gender = + .encounterMusic_gender = #line 16153 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16154 @@ -40339,7 +40339,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 16172 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 16174 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 16175 @@ -40382,7 +40382,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 16189 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 16191 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 16192 @@ -40436,7 +40436,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 16210 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 16212 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 16213 @@ -40490,7 +40490,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_TRIATHLETE, #line 16231 .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 16233 TRAINER_ENCOUNTER_MUSIC_SWIMMER, #line 16234 @@ -40544,7 +40544,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 16252 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 16254 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16255 @@ -40587,7 +40587,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 16269 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 16271 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16272 @@ -40641,7 +40641,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 16290 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 16292 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16293 @@ -40695,7 +40695,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BLACK_BELT, #line 16311 .trainerPic = TRAINER_PIC_BLACK_BELT, - .encounterMusic_gender = + .encounterMusic_gender = #line 16313 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16314 @@ -40749,9 +40749,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 16332 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16333 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16334 TRAINER_ENCOUNTER_MUSIC_COOL, #line 16335 @@ -40796,9 +40796,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 16350 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16351 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16352 TRAINER_ENCOUNTER_MUSIC_COOL, #line 16353 @@ -40854,9 +40854,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 16372 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16373 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16374 TRAINER_ENCOUNTER_MUSIC_COOL, #line 16375 @@ -40912,9 +40912,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_COOLTRAINER, #line 16394 .trainerPic = TRAINER_PIC_COOLTRAINER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16395 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16396 TRAINER_ENCOUNTER_MUSIC_COOL, #line 16397 @@ -40970,7 +40970,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 16416 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 16418 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16419 @@ -41024,7 +41024,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 16437 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 16439 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16440 @@ -41078,7 +41078,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 16458 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 16460 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16461 @@ -41132,7 +41132,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GUITARIST, #line 16479 .trainerPic = TRAINER_PIC_GUITARIST, - .encounterMusic_gender = + .encounterMusic_gender = #line 16481 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16482 @@ -41186,7 +41186,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 16500 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 16502 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16503 @@ -41229,7 +41229,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 16517 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 16519 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16520 @@ -41283,7 +41283,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 16538 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 16540 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16541 @@ -41337,7 +41337,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_HIKER, #line 16559 .trainerPic = TRAINER_PIC_HIKER, - .encounterMusic_gender = + .encounterMusic_gender = #line 16561 TRAINER_ENCOUNTER_MUSIC_HIKER, #line 16562 @@ -41391,9 +41391,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 16580 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16581 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16582 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16583 @@ -41480,9 +41480,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 16613 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16614 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16615 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16616 @@ -41569,9 +41569,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 16646 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16647 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16648 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16649 @@ -41658,9 +41658,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PKMN_BREEDER, #line 16679 .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16680 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16681 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16682 @@ -41747,9 +41747,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 16712 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 16713 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16714 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16715 @@ -41792,9 +41792,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 16729 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 16730 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16731 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16732 @@ -41848,9 +41848,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 16750 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 16751 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16752 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16753 @@ -41904,9 +41904,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_BEAUTY, #line 16771 .trainerPic = TRAINER_PIC_BEAUTY, - .encounterMusic_gender = + .encounterMusic_gender = #line 16772 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16773 TRAINER_ENCOUNTER_MUSIC_FEMALE, #line 16774 @@ -41960,9 +41960,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 16792 .trainerPic = TRAINER_PIC_PSYCHIC_F, - .encounterMusic_gender = + .encounterMusic_gender = #line 16793 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16794 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16795 @@ -41992,7 +41992,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_PSYCHIC, #line 16804 .trainerPic = TRAINER_PIC_PSYCHIC_M, - .encounterMusic_gender = + .encounterMusic_gender = #line 16806 TRAINER_ENCOUNTER_MUSIC_INTENSE, #line 16807 @@ -42033,7 +42033,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_GENTLEMAN, #line 16820 .trainerPic = TRAINER_PIC_GENTLEMAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 16822 TRAINER_ENCOUNTER_MUSIC_RICH, #line 16823 @@ -42063,7 +42063,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 16832 .trainerPic = TRAINER_PIC_RED, - .encounterMusic_gender = + .encounterMusic_gender = #line 16834 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16835 @@ -42093,9 +42093,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RIVAL, #line 16844 .trainerPic = TRAINER_PIC_LEAF, - .encounterMusic_gender = + .encounterMusic_gender = #line 16845 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16846 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16847 @@ -42125,7 +42125,7 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RS_PROTAG, #line 16856 .trainerPic = TRAINER_PIC_RS_BRENDAN, - .encounterMusic_gender = + .encounterMusic_gender = #line 16858 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16859 @@ -42155,9 +42155,9 @@ F_TRAINER_FEMALE | .trainerClass = TRAINER_CLASS_RS_PROTAG, #line 16868 .trainerPic = TRAINER_PIC_RS_MAY, - .encounterMusic_gender = + .encounterMusic_gender = #line 16869 -F_TRAINER_FEMALE | +F_TRAINER_FEMALE | #line 16870 TRAINER_ENCOUNTER_MUSIC_MALE, #line 16871 diff --git a/src/daycare.c b/src/daycare.c index 26b86ec1e2..6b6b84ac58 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -259,6 +259,13 @@ static void StorePokemonInDaycare(struct Pokemon *mon, struct DaycareMon *daycar TakeMailFromMon(mon); } + u32 newSpecies = GetFormChangeTargetSpecies(mon, FORM_CHANGE_DEPOSIT, 0); + if (newSpecies != GetMonData(mon, MON_DATA_SPECIES)) + { + SetMonData(mon, MON_DATA_SPECIES, &newSpecies); + CalculateMonStats(mon); + } + daycareMon->mon = mon->box; daycareMon->steps = 0; ZeroMonData(mon); diff --git a/src/dexnav.c b/src/dexnav.c index 9247ff77a3..61b7b78ba0 100644 --- a/src/dexnav.c +++ b/src/dexnav.c @@ -61,10 +61,10 @@ #include "gba/m4a_internal.h" #if DEXNAV_ENABLED -STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0, FlagSysDexNavSearch_Must_Not_Be_Zero); -STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0, FlagSysDetectorMode_Must_Not_Be_Zero); -STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0, VarDexNavSpecies_Must_Not_Be_Zero); -STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0, VarDexNavStepCounter_Must_Not_Be_Zero); +STATIC_ASSERT(DN_FLAG_SEARCHING != 0, DNFlagSearching_Must_Not_Be_Zero); +STATIC_ASSERT(DN_FLAG_DETECTOR_MODE != 0, DNFlagDetectorMode_Must_Not_Be_Zero); +STATIC_ASSERT(DN_VAR_SPECIES != 0, DNVarSpecies_Must_Not_Be_Zero); +STATIC_ASSERT(DN_VAR_STEP_COUNTER != 0, DNVarStepCounter_Must_Not_Be_Zero); #endif // Defines @@ -859,7 +859,7 @@ static void Task_SetUpDexNavSearch(u8 taskId) DexNavUpdateSearchWindow(sDexNavSearchDataPtr->proximity, searchLevel); } - FlagSet(FLAG_SYS_DEXNAV_SEARCH); + FlagSet(DN_FLAG_SEARCHING); gPlayerAvatar.creeping = TRUE; //initialize as true in case mon appears beside you task->tProximity = gSprites[gPlayerAvatar.spriteId].x; task->tFrameCount = 0; @@ -980,9 +980,9 @@ static void DexNavDrawIcons(void) bool8 TryStartDexNavSearch(void) { u8 taskId; - u16 val = VarGet(VAR_DEXNAV_SPECIES); + u16 val = VarGet(DN_VAR_SPECIES); - if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) || (val & DEXNAV_MASK_SPECIES) == SPECIES_NONE) + if (FlagGet(DN_FLAG_SEARCHING) || (val & DEXNAV_MASK_SPECIES) == SPECIES_NONE) return FALSE; HideMapNamePopUpWindow(); @@ -996,7 +996,7 @@ bool8 TryStartDexNavSearch(void) void EndDexNavSearch(u8 taskId) { - FlagClear(FLAG_SYS_DEXNAV_SEARCH); + FlagClear(DN_FLAG_SEARCHING); DestroyTask(taskId); RemoveDexNavWindowAndGfx(); FieldEffectStop(&gSprites[sDexNavSearchDataPtr->fldEffSpriteId], sDexNavSearchDataPtr->fldEffId); @@ -1114,7 +1114,7 @@ static void Task_DexNavSearch(u8 taskId) CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel, sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves); - FlagClear(FLAG_SYS_DEXNAV_SEARCH); + FlagClear(DN_FLAG_SEARCHING); ScriptContext_SetupScript(EventScript_StartDexNavBattle); Free(sDexNavSearchDataPtr); DestroyTask(taskId); @@ -2018,7 +2018,7 @@ static void DrawSpeciesIcons(void) species = sDexNavUiDataPtr->hiddenSpecies[i]; x = ROW_HIDDEN_ICON_X + 24 * i; y = ROW_HIDDEN_ICON_Y; - if (FlagGet(FLAG_SYS_DETECTOR_MODE)) + if (FlagGet(DN_FLAG_DETECTOR_MODE)) TryDrawIconInSlot(species, x, y); else if (species == SPECIES_NONE || species > NUM_SPECIES) CreateNoDataIcon(x, y); @@ -2043,7 +2043,7 @@ static u16 DexNavGetSpecies(void) species = sDexNavUiDataPtr->landSpecies[sDexNavUiDataPtr->cursorCol + COL_LAND_COUNT]; break; case ROW_HIDDEN: - if (!FlagGet(FLAG_SYS_DETECTOR_MODE)) + if (!FlagGet(DN_FLAG_DETECTOR_MODE)) species = SPECIES_NONE; else species = sDexNavUiDataPtr->hiddenSpecies[sDexNavUiDataPtr->cursorCol]; @@ -2263,7 +2263,7 @@ static bool8 DexNav_DoGfxSetup(void) gMain.state++; break; case 7: - PrintSearchableSpecies(VarGet(VAR_DEXNAV_SPECIES) & DEXNAV_MASK_SPECIES); + PrintSearchableSpecies(VarGet(DN_VAR_SPECIES) & DEXNAV_MASK_SPECIES); DexNavLoadEncounterData(); gMain.state++; break; @@ -2461,7 +2461,7 @@ static void Task_DexNavMain(u8 taskId) PlayCry_Script(species, 0); // create value to store in a var - VarSet(VAR_DEXNAV_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species)); + VarSet(DN_VAR_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species)); } else { @@ -2492,11 +2492,11 @@ static void Task_DexNavMain(u8 taskId) ///////////////////////// bool8 TryFindHiddenPokemon(void) { - u16 *stepPtr = GetVarPointer(VAR_DEXNAV_STEP_COUNTER); + u16 *stepPtr = GetVarPointer(DN_VAR_STEP_COUNTER); if (DEXNAV_ENABLED == 0 - || !FlagGet(FLAG_SYS_DETECTOR_MODE) - || FlagGet(FLAG_SYS_DEXNAV_SEARCH) + || !FlagGet(DN_FLAG_DETECTOR_MODE) + || FlagGet(DN_FLAG_SEARCHING) || GetFlashLevel() > 0) { if (stepPtr != NULL) @@ -2677,8 +2677,8 @@ void TryIncrementSpeciesSearchLevel(u16 dexNum) void ResetDexNavSearch(void) { gSaveBlock3Ptr->dexNavChain = 0; //reset dex nav chaining on new map - VarSet(VAR_DEXNAV_STEP_COUNTER, 0); //reset hidden pokemon step counter - if (FlagGet(FLAG_SYS_DEXNAV_SEARCH)) + VarSet(DN_VAR_STEP_COUNTER, 0); //reset hidden pokemon step counter + if (FlagGet(DN_FLAG_SEARCHING)) EndDexNavSearch(FindTaskIdByFunc(Task_DexNavSearch)); //moving to new map ends dexnav search } diff --git a/src/easy_chat.c b/src/easy_chat.c index aa8405be75..0de7abad25 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1479,10 +1479,10 @@ void ShowEasyChatScreen(void) break; case EASY_CHAT_TYPE_BARD_SONG: bard = &gSaveBlock1Ptr->oldMan.bard; - for (i = 0; i < BARD_SONG_LENGTH; i ++) - bard->temporaryLyrics[i] = bard->songLyrics[i]; + for (i = 0; i < NUM_BARD_SONG_WORDS; i ++) + bard->newSongLyrics[i] = bard->songLyrics[i]; - words = bard->temporaryLyrics; + words = bard->newSongLyrics; break; case EASY_CHAT_TYPE_INTERVIEW: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.words; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index edac91fcf5..261529f6fe 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -25,6 +25,7 @@ #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" +#include "party_menu.h" #include "pokemon.h" #include "pokeball.h" #include "random.h" @@ -2184,21 +2185,24 @@ static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) } } -static u16 GetOverworldCastformSpecies(void) +u16 GetOverworldWeatherSpecies(u16 species) { - switch (GetCurrentWeather()) + u32 i; + u32 weather = GetCurrentWeather(); + const struct FormChange *formChanges = GetSpeciesFormChanges(species); + + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { - case WEATHER_SUNNY_CLOUDS: - case WEATHER_DROUGHT: - return SPECIES_CASTFORM_SUNNY; - case WEATHER_RAIN: - case WEATHER_RAIN_THUNDERSTORM: - case WEATHER_DOWNPOUR: - return SPECIES_CASTFORM_RAINY; - case WEATHER_SNOW: - return SPECIES_CASTFORM_SNOWY; + // Unlike other form change checks, we don't do the "species != formChanges[i].targetSpecies" check + if (formChanges[i].method == FORM_CHANGE_OVERWORLD_WEATHER) + { + if (formChanges[i].param1 == weather) + return formChanges[i].targetSpecies; + else if (formChanges[i].param1 == WEATHER_NONE) // Set the default form for weather not defined in form change table + species = formChanges[i].targetSpecies; + } } - return SPECIES_CASTFORM_NORMAL; + return species; } static bool8 GetMonInfo(struct Pokemon *mon, u16 *species, u8 *form, u8 *shiny) @@ -2219,8 +2223,8 @@ static bool8 GetMonInfo(struct Pokemon *mon, u16 *species, u8 *form, u8 *shiny) case SPECIES_UNOWN: *form = GET_UNOWN_LETTER(mon->box.personality); break; - case SPECIES_CASTFORM: // form is based on overworld weather - *species = GetOverworldCastformSpecies(); + default: + *species = GetOverworldWeatherSpecies(*species); break; } return TRUE; @@ -5539,14 +5543,20 @@ static bool32 EndFollowerTransformEffect(struct ObjectEvent *objectEvent, struct static bool32 TryStartFollowerTransformEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u32 multi; - if (GET_BASE_SPECIES_ID(OW_SPECIES(objectEvent)) == SPECIES_CASTFORM - && OW_SPECIES(objectEvent) != (multi = GetOverworldCastformSpecies())) + struct Pokemon *mon; + u32 ability; + if (DoesSpeciesHaveFormChangeMethod(OW_SPECIES(objectEvent), FORM_CHANGE_OVERWORLD_WEATHER) + && OW_SPECIES(objectEvent) != (multi = GetOverworldWeatherSpecies(OW_SPECIES(objectEvent)))) { sprite->data[7] = TRANSFORM_TYPE_WEATHER << 8; + PlaySE(SE_M_MINIMIZE); return TRUE; } - else if ((Random() & 0xFFFF) < 18 && GetLocalWildMon(FALSE) - && (OW_SPECIES(objectEvent) == SPECIES_MEW || OW_SPECIES(objectEvent) == SPECIES_DITTO)) + + if (OW_FOLLOWERS_COPY_WILD_PKMN + && (MonKnowsMove(mon = GetFirstLiveMon(), MOVE_TRANSFORM) + || (ability = GetMonAbility(mon)) == ABILITY_IMPOSTER || ability == ABILITY_ILLUSION) + && (Random() & 0xFFFF) < 18 && GetLocalWildMon(FALSE)) { sprite->data[7] = TRANSFORM_TYPE_RANDOM_WILD << 8; PlaySE(SE_M_MINIMIZE); @@ -5580,7 +5590,7 @@ static bool8 UpdateFollowerTransformEffect(struct ObjectEvent *objectEvent, stru break; case TRANSFORM_TYPE_WEATHER: multi = objectEvent->graphicsId; - objectEvent->graphicsId = GetOverworldCastformSpecies(); + objectEvent->graphicsId = GetOverworldWeatherSpecies(OW_SPECIES(objectEvent)); if (!objectEvent->graphicsId) { objectEvent->graphicsId = multi; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index d87c7ca010..a9be5b55a0 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -117,7 +117,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) input->pressedAButton = TRUE; if (newKeys & B_BUTTON) input->pressedBButton = TRUE; - if (newKeys & R_BUTTON && !FlagGet(FLAG_SYS_DEXNAV_SEARCH)) + if (newKeys & R_BUTTON && !FlagGet(DN_FLAG_SEARCHING)) input->pressedRButton = TRUE; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 2aed46627c..e9cd3149f7 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -669,7 +669,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) gPlayerAvatar.creeping = FALSE; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) { - if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON)) + if (FlagGet(DN_FLAG_SEARCHING) && (heldKeys & A_BUTTON)) { gPlayerAvatar.creeping = TRUE; PlayerWalkSlow(direction); @@ -693,7 +693,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; return; } - else if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON)) + else if (FlagGet(DN_FLAG_SEARCHING) && (heldKeys & A_BUTTON)) { gPlayerAvatar.creeping = TRUE; PlayerWalkSlow(direction); diff --git a/src/field_weather.c b/src/field_weather.c index db6ab5d179..73299a9a55 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -248,11 +248,28 @@ void SetNextWeather(u8 weather) gWeatherPtr->finishStep = 0; } +static void UpdateWeatherForms(void) +{ + s32 i; + for (i = 0; i < PARTY_SIZE; i++) + { + struct Pokemon *mon = &gPlayerParty[i]; + u16 species = GetMonData(mon, MON_DATA_SPECIES); + u16 targetSpecies = GetOverworldWeatherSpecies(species); + if (species != targetSpecies) + { + SetMonData(mon, MON_DATA_SPECIES, &targetSpecies); + CalculateMonStats(mon); + } + } +} + void SetCurrentAndNextWeather(u8 weather) { PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; + UpdateWeatherForms(); } void SetCurrentAndNextWeatherNoDelay(u8 weather) @@ -262,6 +279,7 @@ void SetCurrentAndNextWeatherNoDelay(u8 weather) gWeatherPtr->nextWeather = weather; // Overrides the normal delay during screen fading. gWeatherPtr->readyForInit = TRUE; + UpdateWeatherForms(); } static void Task_WeatherInit(u8 taskId) @@ -289,6 +307,7 @@ static void Task_WeatherMain(u8 taskId) gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; gWeatherPtr->currWeather = gWeatherPtr->nextWeather; gWeatherPtr->weatherChangeComplete = TRUE; + UpdateWeatherForms(); } } else diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 5c7d23b5ac..1e2b9a95fc 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -65,7 +65,7 @@ static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_tran static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal"); static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal"); -static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal"); + static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz"); static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.lz"); @@ -219,7 +219,7 @@ static void Task_ExitCaveTransition2(u8 taskId) LZ77UnCompVram(sCaveTransitionTiles, (void *)(VRAM + 0xC000)); LZ77UnCompVram(sCaveTransitionTilemap, (void *)(VRAM + 0xF800)); LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), PLTT_SIZE_4BPP); - LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), PLTT_SIZEOF(8)); + LoadPalette(&sCaveTransitionPalette_Enter[8], BG_PLTT_ID(14), PLTT_SIZEOF(8)); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 @@ -249,7 +249,7 @@ static void Task_ExitCaveTransition3(u8 taskId) u16 blend = count + 0x1000; SetGpuReg(REG_OFFSET_BLDALPHA, blend); - if (count <= 0x10) + if (count <= 16) { gTasks[taskId].data[1]++; } @@ -270,7 +270,7 @@ static void Task_ExitCaveTransition4(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit) - PLTT_SIZEOF(count)); + LoadPalette(&sCaveTransitionPalette_Enter[8 + count], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); } else { diff --git a/src/intro.c b/src/intro.c index 93417bc4a1..88cb1f820e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -110,7 +110,7 @@ static void MainCB2_EndIntro(void); extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; -extern const struct SpriteTemplate gAncientPowerRockSpriteTemplate[]; +extern const struct SpriteTemplate gAncientPowerRockSpriteTemplate; enum { COPYRIGHT_INITIALIZE, @@ -2002,7 +2002,7 @@ static void CreateGroudonRockSprites(u8 taskId) for (i = 0; i < (int)ARRAY_COUNT(sGroudonRockData); i++) { - spriteId = CreateSprite(gAncientPowerRockSpriteTemplate, sGroudonRockData[i][0], DISPLAY_HEIGHT, i); + spriteId = CreateSprite(&gAncientPowerRockSpriteTemplate, sGroudonRockData[i][0], DISPLAY_HEIGHT, i); gSprites[spriteId].callback = SpriteCB_GroudonRocks; gSprites[spriteId].oam.priority = 0; gSprites[spriteId].sRockId = i; diff --git a/src/list_menu.c b/src/list_menu.c index ab93961fd5..35300de955 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -683,8 +683,6 @@ static void ListMenuDrawCursor(struct ListMenu *list) } } -#undef TASK_NONE - static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorObjId) { struct CursorStruct cursor; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 8b8bfb2db5..a4b56bf674 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -24,7 +24,7 @@ #include "constants/mauville_old_man.h" static void InitGiddyTaleList(void); -static void StartBardSong(bool8 useTemporaryLyrics); +static void StartBardSong(bool8 useNewSongLyrics); static void Task_BardSong(u8 taskId); static void StorytellerSetup(void); static void Storyteller_ResetFlag(void); @@ -33,11 +33,11 @@ static u8 sSelectedStory; COMMON_DATA struct BardSong gBardSong = {0}; -static EWRAM_DATA u16 sUnknownBardRelated = 0; +static EWRAM_DATA u16 sUnusedPitchTableIndex = 0; static EWRAM_DATA struct MauvilleManStoryteller * sStorytellerPtr = NULL; static EWRAM_DATA u8 sStorytellerWindowId = 0; -static const u16 sDefaultBardSongLyrics[BARD_SONG_LENGTH] = { +static const u16 sDefaultBardSongLyrics[NUM_BARD_SONG_WORDS] = { EC_WORD_SHAKE, EC_WORD_IT, EC_WORD_DO, @@ -79,7 +79,7 @@ static void SetupBard(void) bard->id = MAUVILLE_MAN_BARD; bard->hasChangedSong = FALSE; bard->language = gGameLanguage; - for (i = 0; i < BARD_SONG_LENGTH; i++) + for (i = 0; i < NUM_BARD_SONG_WORDS; i++) bard->songLyrics[i] = sDefaultBardSongLyrics[i]; } @@ -163,24 +163,33 @@ void SaveBardSongLyrics(void) for (i = 0; i < TRAINER_ID_LENGTH; i++) bard->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; - for (i = 0; i < BARD_SONG_LENGTH; i++) - bard->songLyrics[i] = bard->temporaryLyrics[i]; + for (i = 0; i < NUM_BARD_SONG_WORDS; i++) + bard->songLyrics[i] = bard->newSongLyrics[i]; bard->hasChangedSong = TRUE; } -// Copies lyrics into gStringVar4 +// Copies lyrics into gStringVar4. +// gSpecialVar_0x8004 is used in these functions to indicate which song should be played. +// If it's set to 0 the Bard's current song should be played, otherwise the new user-provided song should be played. +// Its set in the scripts right before 'PlayBardSong' is called. static void PrepareSongText(void) { struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; - u16 * lyrics = gSpecialVar_0x8004 == 0 ? bard->songLyrics : bard->temporaryLyrics; + u16 * lyrics = !gSpecialVar_0x8004 ? bard->songLyrics : bard->newSongLyrics; u8 *wordEnd = gStringVar4; u8 *str = wordEnd; - u16 lineNum; + u16 paragraphNum; - // Put three words on each line - for (lineNum = 0; lineNum < 2; lineNum++) + // Easy chat "words" aren't strictly single words, e.g. EC_WORD_MATCH_UP is the string "MATCH UP". + // The bard song needs to know when it's at the end of an easy chat word and not just at a space in + // the middle of one, so the loop below will replace spaces in each easy chat word with CHAR_BARD_WORD_DELIMIT. + // When it comes time to print the song's text all the CHAR_BARD_WORD_DELIMIT will get replaced with CHAR_SPACE. + // + // The song text will be displayed in two paragraphs, each containing 3 easy chat words (2 on the first line and 1 on the second). + for (paragraphNum = 0; paragraphNum < 2; paragraphNum++) { + // Line 1, 1st word wordEnd = CopyEasyChatWord(wordEnd, *(lyrics++)); while (wordEnd != str) { @@ -192,6 +201,7 @@ static void PrepareSongText(void) str++; *(wordEnd++) = CHAR_SPACE; + // Line 1, 2nd word wordEnd = CopyEasyChatWord(wordEnd, *(lyrics++)); while (wordEnd != str) { @@ -203,6 +213,7 @@ static void PrepareSongText(void) str++; *(wordEnd++) = CHAR_NEWLINE; + // Line 2, 1st word wordEnd = CopyEasyChatWord(wordEnd, *(lyrics++)); while (wordEnd != str) { @@ -211,8 +222,10 @@ static void PrepareSongText(void) str++; } - if (lineNum == 0) + if (paragraphNum == 0) { + // Erase the 1st paragraph for displaying the 2nd. + // The == 0 check assumes there are only 2 paragraphs. *(wordEnd++) = EXT_CTRL_CODE_BEGIN; *(wordEnd++) = EXT_CTRL_CODE_FILL_WINDOW; } @@ -417,17 +430,19 @@ enum { #define tWordState data[1] #define tDelay data[2] #define tCharIndex data[3] -#define tCurrWord data[4] -#define tUseTemporaryLyrics data[5] +#define tLyricsIndex data[4] +#define tUseNewSongLyrics data[5] -#define MACRO1(a) (((a) & 3) + (((a) / 8) & 1)) -#define MACRO2(a) (((a) % 4) + (((a) / 8) & 1)) +// Takes a 16-bit easy chat word value and returns a value 0-4 (i.e. a value less than NUM_BARD_PITCH_TABLES_PER_SIZE). +// The relationship between the easy chat word and the chosen pitch table is essentially arbitrary. +// This value will be used twice; once for an unused variable, and again to select a pitch table in CalcWordSounds. +#define WORD_TO_PITCH_TABLE_INDEX(a) ( MOD(a, (NUM_BARD_PITCH_TABLES_PER_SIZE-1)) + (((a) >> 3) & 1) ) -static void StartBardSong(bool8 useTemporaryLyrics) +static void StartBardSong(bool8 useNewSongLyrics) { u8 taskId = CreateTask(Task_BardSong, 80); - gTasks[taskId].tUseTemporaryLyrics = useTemporaryLyrics; + gTasks[taskId].tUseNewSongLyrics = useNewSongLyrics; } static void EnableTextPrinters(void) @@ -448,6 +463,18 @@ static void DrawSongTextWindow(const u8 *str) CopyWindowToVram(0, COPYWIN_FULL); } +#define BARD_SONG_BASE_VOLUME 0x100 +#define BARD_SONG_BASE_PITCH 0x200 + +enum { + SOUND_STATE_START, + SOUND_STATE_PLAY, + SOUND_STATE_SET_BASE, + SOUND_STATE_END, + SOUND_STATE_WAIT, +}; + +// Sing one frame of the bard's song. 'task' is a pointer to Task_BardSong, which handles changing the states in here. static void BardSing(struct Task *task, struct BardSong *song) { switch (task->tState) @@ -459,62 +486,73 @@ static void BardSing(struct Task *task, struct BardSong *song) s32 i; // Copy lyrics - if (gSpecialVar_0x8004 == 0) + if (!gSpecialVar_0x8004) lyrics = bard->songLyrics; else - lyrics = bard->temporaryLyrics; - for (i = 0; i < BARD_SONG_LENGTH; i++) + lyrics = bard->newSongLyrics; + + for (i = 0; i < NUM_BARD_SONG_WORDS; i++) song->lyrics[i] = lyrics[i]; - song->currWord = 0; + + song->lyricsIndex = 0; + break; } - break; - case BARD_STATE_WAIT_BGM: - break; case BARD_STATE_GET_WORD: { - u16 word = song->lyrics[song->currWord]; - song->sound = GetWordSounds(word); - GetWordPhonemes(song, MACRO1(word)); - song->currWord++; - if (song->sound->songLengthId != 0xFF) + u16 easyChatWord = song->lyrics[song->lyricsIndex]; + song->soundTemplates = GetWordSoundTemplates(easyChatWord); + CalcWordSounds(song, WORD_TO_PITCH_TABLE_INDEX(easyChatWord)); + song->lyricsIndex++; + if (song->soundTemplates[0].songId != PHONEME_ID_NONE) { - song->state = 0; + // Word has valid sounds, begin playing. + song->state = SOUND_STATE_START; } else { - song->state = 3; - song->phonemeTimer = 2; + // Word has no valid sounds, skip to the end. + song->state = SOUND_STATE_END; + song->timer = 2; } break; } case BARD_STATE_HANDLE_WORD: case BARD_STATE_WAIT_WORD: { - const struct BardSound *sound = &song->sound[song->currPhoneme]; + const struct BardSoundTemplate *template = &song->soundTemplates[song->soundIndex]; switch (song->state) { - case 0: - song->phonemeTimer = song->phonemes[song->currPhoneme].length; - if (sound->songLengthId <= 50) + case SOUND_STATE_START: + song->timer = song->sounds[song->soundIndex].length; + if (template->songId < NUM_PHONEME_SONGS) { - u8 num = sound->songLengthId / 3; - m4aSongNumStart(PH_TRAP_HELD + 3 * num); + // Phoneme "songs" come in triplets of PH_*_BLEND, PH_*_HELD, and PH_*_SOLO. + // The division then multiplication by 3 below is rounding any value from one of these triplets to a PH_*_HELD. + // This means the actual song files for any phoneme other than PH_*_HELD won't be played here, and the only difference + // when specifying a PH_*_BLEND or PH_*_SOLO in the songId will be the length of the sound, determined by 'sPhonemeLengths'. + u8 phonemeTripletId = template->songId / 3; + m4aSongNumStart((FIRST_PHONEME_SONG + 1) + phonemeTripletId * 3); } - song->state = 2; - song->phonemeTimer--; + song->state = SOUND_STATE_SET_BASE; + song->timer--; break; - case 2: - song->state = 1; - if (sound->songLengthId <= 50) + case SOUND_STATE_SET_BASE: + song->state = SOUND_STATE_PLAY; + if (template->songId < NUM_PHONEME_SONGS) { - song->volume = 0x100 + sound->volume * 16; + // Adjust the song volume for the current phoneme. + // In practice no phonemes use this, so volume here will always be BARD_SONG_BASE_VOLUME. + song->volume = BARD_SONG_BASE_VOLUME + template->volume * 16; m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); - song->pitch = 0x200 + song->phonemes[song->currPhoneme].pitch; + + // Adjust the song pitch for the current phoneme. + song->pitch = BARD_SONG_BASE_PITCH + song->sounds[song->soundIndex].pitch; m4aMPlayPitchControl(&gMPlayInfo_SE2, TRACKS_ALL, song->pitch); } break; - case 1: + case SOUND_STATE_PLAY: + // Modulate the volume and pitch to make it sound a little more like singing. if (song->voiceInflection > 10) song->volume -= 2; if (song->voiceInflection & 1) @@ -524,33 +562,37 @@ static void BardSing(struct Task *task, struct BardSong *song) m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); m4aMPlayPitchControl(&gMPlayInfo_SE2, TRACKS_ALL, song->pitch); song->voiceInflection++; - song->phonemeTimer--; - if (song->phonemeTimer == 0) + + song->timer--; + if (song->timer == 0) { - song->currPhoneme++; - if (song->currPhoneme != 6 && song->sound[song->currPhoneme].songLengthId != 0xFF) + if (++song->soundIndex != MAX_BARD_SOUNDS_PER_WORD && song->soundTemplates[song->soundIndex].songId != PHONEME_ID_NONE) { - song->state = 0; + // There are more sounds to play for this word, return to the start. + song->state = SOUND_STATE_START; } else { - song->state = 3; - song->phonemeTimer = 2; + // We've reached the final sound for this word, stop playing. + song->state = SOUND_STATE_END; + song->timer = 2; } } break; - case 3: - song->phonemeTimer--; - if (song->phonemeTimer == 0) + case SOUND_STATE_END: + // Delay, then stop playing the phoneme. + if (--song->timer == 0) { m4aMPlayStop(&gMPlayInfo_SE2); - song->state = 4; + song->state = SOUND_STATE_WAIT; // We'll remain stuck at this sound state until Task_BardSong changes states from HANDLE_WORD/WAIT_WORD } break; } - } break; + } case BARD_STATE_PAUSE: + case BARD_STATE_WAIT_BGM: + // Non-singing states. break; } } @@ -569,7 +611,7 @@ static void Task_BardSong(u8 taskId) task->tWordState = 0; task->tDelay = 0; task->tCharIndex = 0; - task->tCurrWord = 0; + task->tLyricsIndex = 0; FadeOutBGMTemporarily(4); task->tState = BARD_STATE_WAIT_BGM; break; @@ -593,15 +635,17 @@ static void Task_BardSong(u8 taskId) wordLen++; } - if (!task->tUseTemporaryLyrics) - sUnknownBardRelated = MACRO2(bard->songLyrics[task->tCurrWord]); + // sUnusedPitchTableIndex is never read. For debugging perhaps, or one of the other languages. + if (!task->tUseNewSongLyrics) + sUnusedPitchTableIndex = WORD_TO_PITCH_TABLE_INDEX(bard->songLyrics[task->tLyricsIndex]); else - sUnknownBardRelated = MACRO2(bard->temporaryLyrics[task->tCurrWord]); + sUnusedPitchTableIndex = WORD_TO_PITCH_TABLE_INDEX(bard->newSongLyrics[task->tLyricsIndex]); gBardSong.length /= wordLen; if (gBardSong.length <= 0) gBardSong.length = 1; - task->tCurrWord++; + + task->tLyricsIndex++; if (task->tDelay == 0) { @@ -633,7 +677,7 @@ static void Task_BardSong(u8 taskId) } else if (gStringVar4[task->tCharIndex] == CHAR_SPACE) { - // Handle space + // End of easy chat word, move on to the next one. EnableTextPrinters(); task->tCharIndex++; task->tState = BARD_STATE_GET_WORD; @@ -649,14 +693,16 @@ static void Task_BardSong(u8 taskId) else if (gStringVar4[task->tCharIndex] == EXT_CTRL_CODE_BEGIN) { // Handle ctrl code + // The only expected ctrl codes are those for clearing the end of the paragraph, + // so this assumes there's a new word coming and does a short delay before the next paragraph. task->tCharIndex += 2; // skip over control codes task->tState = BARD_STATE_GET_WORD; task->tDelay = 8; } else if (gStringVar4[task->tCharIndex] == CHAR_BARD_WORD_DELIMIT) { - // Handle word boundary - gStringVar4[task->tCharIndex] = CHAR_SPACE; // Replace with a real space + // Space within the current easy chat word (see PrepareSongText), just replace it with a real space. + gStringVar4[task->tCharIndex] = CHAR_SPACE; EnableTextPrinters(); task->tCharIndex++; task->tDelay = 0; diff --git a/src/move_relearner.c b/src/move_relearner.c index e312e6256d..7d3b61213c 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -160,8 +160,6 @@ enum { #define GFXTAG_UI 5525 #define PALTAG_UI 5526 -#define MAX_RELEARNER_MOVES max(MAX_LEVEL_UP_MOVES, 25) - static EWRAM_DATA struct { u8 state; diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 50a00c22b8..3c14080614 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5307,7 +5307,6 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) else //Appeal + Jam { DestroyCategoryIcon(); - gSprites[sPokedexView->categoryIconSpriteId].invisible = TRUE; //Appeal contest_effectValue = gContestEffects[GetMoveContestEffect(move)].appeal; if (contest_effectValue != 0xFF) diff --git a/src/pokemon.c b/src/pokemon.c index efb4d91abb..fcbde3ba4a 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4425,7 +4425,7 @@ u32 GetGMaxTargetSpecies(u32 species) { const struct FormChange *formChanges = GetSpeciesFormChanges(species); u32 i; - for (i = 0; formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { if (formChanges[i].method == FORM_CHANGE_BATTLE_GIGANTAMAX) return formChanges[i].targetSpecies; @@ -6588,6 +6588,7 @@ u32 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *boxMon, u16 method, u32 targetSpecies = formChanges[i].targetSpecies; break; case FORM_CHANGE_WITHDRAW: + case FORM_CHANGE_DEPOSIT: case FORM_CHANGE_FAINT: case FORM_CHANGE_DAYS_PASSED: targetSpecies = formChanges[i].targetSpecies; @@ -6623,7 +6624,7 @@ void TrySetDayLimitToFormChange(struct Pokemon *mon) u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); const struct FormChange *formChanges = GetSpeciesFormChanges(species); - for (i = 0; formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { if (formChanges[i].method == FORM_CHANGE_DAYS_PASSED && species != formChanges[i].targetSpecies) { @@ -6638,13 +6639,10 @@ bool32 DoesSpeciesHaveFormChangeMethod(u16 species, u16 method) u32 i; const struct FormChange *formChanges = GetSpeciesFormChanges(species); - if (formChanges != NULL) + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) { - for (i = 0; formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) - { - if (method == formChanges[i].method && species != formChanges[i].targetSpecies) - return TRUE; - } + if (method == formChanges[i].method && species != formChanges[i].targetSpecies) + return TRUE; } return FALSE; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 81dff0f435..9714293931 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -550,6 +550,7 @@ EWRAM_DATA static u8 sMovingMonOrigBoxId = 0; EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0; EWRAM_DATA static bool8 sAutoActionOn = 0; EWRAM_DATA static bool8 sJustOpenedBag = 0; +EWRAM_DATA static bool8 sRefreshDisplayMonGfx = FALSE; // Main tasks static void Task_InitPokeStorage(u8); @@ -844,7 +845,7 @@ static void TilemapUtil_DrawPrev(u8); static void TilemapUtil_Draw(u8); // Form changing -void SetMonFormPSS(struct BoxPokemon *boxMon); +void SetMonFormPSS(struct BoxPokemon *boxMon, u32 method); void UpdateSpeciesSpritePSS(struct BoxPokemon *boxmon); static const u8 gText_JustOnePkmn[] = _("There is just one POKéMON with you."); @@ -3773,12 +3774,14 @@ static void GiveChosenBagItem(void) { struct Pokemon *mon = &gPlayerParty[pos]; SetMonData(&gPlayerParty[pos], MON_DATA_HELD_ITEM, &itemId); - SetMonFormPSS(&mon->box); + SetMonFormPSS(&mon->box, FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&mon->box); } else { SetCurrentBoxMonData(pos, MON_DATA_HELD_ITEM, &itemId); - SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][pos]); + SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][pos], FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][pos]); } RemoveBagItem(itemId, 1); @@ -6346,11 +6349,14 @@ static void PlaceMon(void) case CURSOR_AREA_IN_PARTY: SetPlacedMonData(TOTAL_BOXES_COUNT, sCursorPosition); SetPlacedMonSprite(TOTAL_BOXES_COUNT, sCursorPosition); + struct Pokemon *mon = &gPlayerParty[sCursorPosition]; + UpdateSpeciesSpritePSS(&mon->box); break; case CURSOR_AREA_IN_BOX: boxId = StorageGetCurrentBox(); SetPlacedMonData(boxId, sCursorPosition); SetPlacedMonSprite(boxId, sCursorPosition); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[boxId][sCursorPosition]); break; default: return; @@ -6390,12 +6396,15 @@ static void SetPlacedMonData(u8 boxId, u8 position) if (boxId == TOTAL_BOXES_COUNT) { gPlayerParty[position] = sStorage->movingMon; - if (&gPlayerParty[position] == GetFirstLiveMon()) + struct Pokemon *mon = &gPlayerParty[position]; + if (mon == GetFirstLiveMon()) gFollowerSteps = 0; + SetMonFormPSS(&mon->box, FORM_CHANGE_WITHDRAW); } else { SetBoxMonAt(boxId, position, &sStorage->movingMon.box); + SetMonFormPSS(&gPokemonStoragePtr->boxes[boxId][position], FORM_CHANGE_DEPOSIT); } } @@ -6900,13 +6909,13 @@ static void ReshowDisplayMon(void) TryRefreshDisplayMon(); } -void SetMonFormPSS(struct BoxPokemon *boxMon) +void SetMonFormPSS(struct BoxPokemon *boxMon, u32 method) { - u16 targetSpecies = GetFormChangeTargetSpeciesBoxMon(boxMon, FORM_CHANGE_ITEM_HOLD, 0); + u16 targetSpecies = GetFormChangeTargetSpeciesBoxMon(boxMon, method, 0); if (targetSpecies != GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL)) { SetBoxMonData(boxMon, MON_DATA_SPECIES, &targetSpecies); - UpdateSpeciesSpritePSS(boxMon); + sRefreshDisplayMonGfx = TRUE; } } @@ -8885,14 +8894,16 @@ static void TakeItemFromMon(u8 cursorArea, u8 cursorPos) { SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); - SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); + SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos], FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); } else { struct Pokemon *mon = &gPlayerParty[cursorPos]; SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); - SetMonFormPSS(&mon->box); + SetMonFormPSS(&mon->box, FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&mon->box); } sStorage->movingItemId = sStorage->displayMonItemId; @@ -8927,7 +8938,8 @@ static void SwapItemsWithMon(u8 cursorArea, u8 cursorPos) itemId = GetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM); SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sStorage->movingItemId); sStorage->movingItemId = itemId; - SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); + SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos], FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); } else { @@ -8935,7 +8947,8 @@ static void SwapItemsWithMon(u8 cursorArea, u8 cursorPos) itemId = GetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM); SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sStorage->movingItemId); sStorage->movingItemId = itemId; - SetMonFormPSS(&mon->box); + SetMonFormPSS(&mon->box, FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&mon->box); } id = GetItemIconIdxByPosition(CURSOR_AREA_IN_HAND, 0); @@ -8957,14 +8970,16 @@ static void GiveItemToMon(u8 cursorArea, u8 cursorPos) { SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sStorage->movingItemId); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL); - SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); + SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos], FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); } else { struct Pokemon *mon = &gPlayerParty[cursorPos]; SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sStorage->movingItemId); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL); - SetMonFormPSS(&mon->box); + SetMonFormPSS(&mon->box, FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&mon->box); } } @@ -8984,14 +8999,16 @@ static void MoveItemFromMonToBag(u8 cursorArea, u8 cursorPos) { SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); - SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); + SetMonFormPSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos], FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&gPokemonStoragePtr->boxes[StorageGetCurrentBox()][cursorPos]); } else { struct Pokemon *mon = &gPlayerParty[cursorPos]; SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); - SetMonFormPSS(&mon->box); + SetMonFormPSS(&mon->box, FORM_CHANGE_ITEM_HOLD); + UpdateSpeciesSpritePSS(&mon->box); } } @@ -10051,8 +10068,12 @@ void UpdateSpeciesSpritePSS(struct BoxPokemon *boxMon) sStorage->displayMonPalette = GetMonSpritePalFromSpeciesAndPersonality(species, isShiny, pid); if (!sJustOpenedBag) { - LoadDisplayMonGfx(species, pid); - StartDisplayMonMosaicEffect(); + if (sRefreshDisplayMonGfx) + { + LoadDisplayMonGfx(species, pid); + StartDisplayMonMosaicEffect(); + sRefreshDisplayMonGfx = FALSE; + } // Recreate icon sprite if (sInPartyMenu) @@ -10062,9 +10083,10 @@ void UpdateSpeciesSpritePSS(struct BoxPokemon *boxMon) } else { - DestroyBoxMonIcon(sStorage->boxMonsSprites[sCursorPosition]); + DestroyBoxMonIconAtPosition(sCursorPosition); CreateBoxMonIconAtPos(sCursorPosition); - SetBoxMonIconObjMode(sCursorPosition, GetBoxMonData(boxMon, MON_DATA_HELD_ITEM) == ITEM_NONE); + if (sStorage->boxOption == OPTION_MOVE_ITEMS) + SetBoxMonIconObjMode(sCursorPosition, (GetBoxMonData(boxMon, MON_DATA_HELD_ITEM) == ITEM_NONE ? ST_OAM_OBJ_NORMAL : ST_OAM_OBJ_BLEND)); } } sJustOpenedBag = FALSE; diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 7ff04b508f..7215fb4c7b 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -3,6 +3,7 @@ #include "event_data.h" #include "event_object_movement.h" #include "fieldmap.h" +#include "rotating_gate.h" #include "sound.h" #include "sprite.h" #include "constants/songs.h" @@ -939,7 +940,7 @@ void RotatingGate_InitPuzzle(void) } } -void RotatingGatePuzzleCameraUpdate(u16 deltaX, u16 deltaY) +void RotatingGatePuzzleCameraUpdate(s16 deltaX, s16 deltaY) { if (GetCurrentMapRotatingGatePuzzleType()) { @@ -958,7 +959,7 @@ void RotatingGate_InitPuzzleAndGraphics(void) } } -bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y) +bool32 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y) { s32 i; @@ -996,7 +997,7 @@ bool8 CheckForRotatingGatePuzzleCollision(u8 direction, s16 x, s16 y) return FALSE; } -bool8 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y) +bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8 direction, s16 x, s16 y) { s32 i; diff --git a/src/sprite.c b/src/sprite.c index 80418a0d76..55f8c2b701 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -5,8 +5,6 @@ #define MAX_SPRITE_COPY_REQUESTS 64 -#define OAM_MATRIX_COUNT 32 - #define sAnchorX data[6] #define sAnchorY data[7] diff --git a/src/start_menu.c b/src/start_menu.c index 004403e659..fcd8f7b42b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -333,7 +333,7 @@ static void BuildNormalStartMenu(void) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if (FLAG_SYS_DEXNAV_GET != 0 && FlagGet(FLAG_SYS_DEXNAV_GET)) + if (DN_FLAG_DEXNAV_GET != 0 && FlagGet(DN_FLAG_DEXNAV_GET)) AddStartMenuAction(MENU_ACTION_DEXNAV); if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) diff --git a/test/battle/ability/magic_guard.c b/test/battle/ability/magic_guard.c index 8941fb2130..adcfdfc5ac 100644 --- a/test/battle/ability/magic_guard.c +++ b/test/battle/ability/magic_guard.c @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Magic Guard prevents recoil damage to the user") SINGLE_BATTLE_TEST("Magic Guard ignores immobilization that can be caused by paralysis") { - if (B_MAGIC_GUARD >= GEN_4) + if (B_MAGIC_GUARD == GEN_4) PASSES_RANDOMLY(1, 1, RNG_PARALYSIS); else PASSES_RANDOMLY(75, 100, RNG_PARALYSIS); diff --git a/test/battle/ability/symbiosis.c b/test/battle/ability/symbiosis.c new file mode 100644 index 0000000000..5c55370fe4 --- /dev/null +++ b/test/battle/ability/symbiosis.c @@ -0,0 +1,113 @@ +#include "global.h" +#include "test/battle.h" + +DOUBLE_BATTLE_TEST("Symbiosis transfers its item to an ally after it consumes an item") +{ + GIVEN { + ASSUME(gItemsInfo[ITEM_ROOM_SERVICE].holdEffect == HOLD_EFFECT_ROOM_SERVICE); + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_ROOM_SERVICE); } + PLAYER(SPECIES_ORANGURU) { Ability(ABILITY_SYMBIOSIS); Item(ITEM_TOXIC_ORB); } + OPPONENT(SPECIES_KIRLIA); + OPPONENT(SPECIES_SHUCKLE); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_TRICK_ROOM); } + } SCENE { + MESSAGE("The opposing Kirlia used Trick Room!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft); + MESSAGE("Using Room Service, the Speed of Wobbuffet fell!"); + // symbiosis triggers + ABILITY_POPUP(playerRight, ABILITY_SYMBIOSIS); + MESSAGE("Oranguru passed its Toxic Orb to Wobbuffet through Symbiosis!"); + // end of turn, wobb gets poisoned + MESSAGE("Wobbuffet was badly poisoned!"); + STATUS_ICON(playerLeft, STATUS1_TOXIC_POISON); + } THEN { + EXPECT_EQ(playerLeft->item, ITEM_TOXIC_ORB); + EXPECT_EQ(playerRight->item, ITEM_NONE); + } +} + + +DOUBLE_BATTLE_TEST("Symbiosis triggers after partners berry eaten from bug bite") +{ + GIVEN { + ASSUME(gItemsInfo[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LIECHI_BERRY); } + PLAYER(SPECIES_ORANGURU) { Ability(ABILITY_SYMBIOSIS); Item(ITEM_TOXIC_ORB); } + OPPONENT(SPECIES_STARAVIA); + OPPONENT(SPECIES_SHUCKLE); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_BUG_BITE, target: playerLeft); } + } SCENE { + MESSAGE("The opposing Staravia used Bug Bite!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_BUG_BITE, opponentLeft); + HP_BAR(playerLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); + MESSAGE("Using Liechi Berry, the Attack of the opposing Staravia rose!"); + // symbiosis triggers + ABILITY_POPUP(playerRight, ABILITY_SYMBIOSIS); + MESSAGE("Oranguru passed its Toxic Orb to Wobbuffet through Symbiosis!"); + // end of turn, wobb gets poisoned + MESSAGE("Wobbuffet was badly poisoned!"); + STATUS_ICON(playerLeft, STATUS1_TOXIC_POISON); + } THEN { + EXPECT_EQ(playerLeft->item, ITEM_TOXIC_ORB); + EXPECT_EQ(playerRight->item, ITEM_NONE); + } +} + +DOUBLE_BATTLE_TEST("Symbiosis triggers after partner bestows its item") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Speed(100); Item(ITEM_FLAME_ORB); } + PLAYER(SPECIES_ORANGURU) { Speed(75); Ability(ABILITY_SYMBIOSIS); Item(ITEM_TOXIC_ORB); } + OPPONENT(SPECIES_STARAVIA) { Speed(50); } + OPPONENT(SPECIES_SHUCKLE) { Speed(25); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_BESTOW, target: opponentLeft); } + } SCENE { + MESSAGE("Wobbuffet used Bestow!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_BESTOW, playerLeft); + MESSAGE("The opposing Staravia received Flame Orb from Wobbuffet!"); + // symbiosis triggers + ABILITY_POPUP(playerRight, ABILITY_SYMBIOSIS); + MESSAGE("Oranguru passed its Toxic Orb to Wobbuffet through Symbiosis!"); + // end of turn, wobb gets poisoned + MESSAGE("Wobbuffet was badly poisoned!"); + STATUS_ICON(playerLeft, STATUS1_TOXIC_POISON); + // staravia gets burned + MESSAGE("The opposing Staravia was burned!"); + STATUS_ICON(opponentLeft, STATUS1_BURN); + } THEN { + EXPECT_EQ(playerLeft->item, ITEM_TOXIC_ORB); + EXPECT_EQ(playerRight->item, ITEM_NONE); + EXPECT_EQ(opponentLeft->item, ITEM_FLAME_ORB); + } +} + +DOUBLE_BATTLE_TEST("Symbiosis triggers after partner flings its item") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Speed(100); Item(ITEM_FLAME_ORB); } + PLAYER(SPECIES_ORANGURU) { Speed(75); Ability(ABILITY_SYMBIOSIS); Item(ITEM_TOXIC_ORB); } + OPPONENT(SPECIES_STARAVIA) { Speed(50); } + OPPONENT(SPECIES_SHUCKLE) { Speed(25); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_FLING, target: opponentLeft); } + } SCENE { + MESSAGE("Wobbuffet used Fling!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLING, playerLeft); + MESSAGE("The opposing Staravia was burned!"); + STATUS_ICON(opponentLeft, STATUS1_BURN); + // symbiosis triggers + ABILITY_POPUP(playerRight, ABILITY_SYMBIOSIS); + MESSAGE("Oranguru passed its Toxic Orb to Wobbuffet through Symbiosis!"); + // end of turn, wobb gets poisoned + MESSAGE("Wobbuffet was badly poisoned!"); + STATUS_ICON(playerLeft, STATUS1_TOXIC_POISON); + } THEN { + EXPECT_EQ(playerLeft->item, ITEM_TOXIC_ORB); + EXPECT_EQ(playerRight->item, ITEM_NONE); + } +} diff --git a/test/pokemon.c b/test/pokemon.c index 4469fe677d..97e034dc82 100644 --- a/test/pokemon.c +++ b/test/pokemon.c @@ -402,3 +402,23 @@ TEST("createmon [simple]") EXPECT_EQ(GetMonData(&gEnemyParty[1], MON_DATA_SPECIES), SPECIES_WYNAUT); EXPECT_EQ(GetMonData(&gEnemyParty[1], MON_DATA_LEVEL), 10); } + +TEST("Pokémon level up learnsets fit within MAX_LEVEL_UP_MOVES and MAX_RELEARNER_MOVES") +{ + KNOWN_FAILING; + + u32 j, count, species = 0; + const struct LevelUpMove *learnset; + + for(j = 0; j < SPECIES_EGG; j++) + { + PARAMETRIZE { species = j; } + } + + learnset = GetSpeciesLevelUpLearnset(species); + count = 0; + for (j = 0; learnset[j].move != LEVEL_UP_MOVE_END; j++) + count++; + EXPECT_LT(count, MAX_LEVEL_UP_MOVES); + EXPECT_LT(count, MAX_RELEARNER_MOVES - 1); // - 1 because at least one move is already known +} diff --git a/tools/trainerproc/main.c b/tools/trainerproc/main.c index fda4ac7c3f..db49633ee3 100644 --- a/tools/trainerproc/main.c +++ b/tools/trainerproc/main.c @@ -1667,7 +1667,7 @@ static void fprint_trainers(const char *output_path, FILE *f, struct Parsed *par fprintf(f, ",\n"); } - fprintf(f, " .encounterMusic_gender = \n"); + fprintf(f, " .encounterMusic_gender =\n"); if (trainer->gender == GENDER_FEMALE) { fprintf(f, "#line %d\n", trainer->gender_line);