Master to upcoming merge 14/04/26 (#9785)

asm/macros/event.inc

@@ -2341,9 +2341,9 @@
 	.endm
 
 	@ Buffers the nickname of the first alive party member.
-	.macro bufferlivemonnickname out:req
+	.macro bufferlivemonnickname stringVarId:req
 	callnative BufferFirstLiveMonNickname, requests_effects=1
-	.byte \out
+	stringvar \stringVarId
 	.endm
 
 	@ Executes Follower actions

data/battle_scripts_1.s

@@ -7052,6 +7052,12 @@ BattleScript_WhiteHerbRet::
 	removeitem BS_SCRIPTING
 	return
 
+BattleScript_WhiteHerbFling::
+	playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
+	printstring STRINGID_PKMNSITEMRESTOREDSTATUS
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_ItemHealHP_RemoveItem::
 	jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_ItemHealHP_RemoveItemRet_AbilityPopUp
 	goto BattleScript_ItemHealHP_RemoveItemRet_Anim
@@ -8226,4 +8232,3 @@ BattleScript_SilphScopeUnveiled::
 	printstring STRINGID_GHOSTWASMAROWAK
 	waitmessage B_WAIT_TIME_LONG
 	end2
-

data/scripts/follower.inc

@@ -12,7 +12,7 @@ gText_WantsToFly::
 
 EventScript_Follower::
 	lock
-	bufferlivemonnickname 0
+	bufferlivemonnickname STR_VAR_1
 	playfirstmoncry
 	getfolloweraction
 EventScript_FollowerEnd::

include/battle.h

@@ -1113,17 +1113,17 @@ static inline enum BattlerId GetBattlerAtPosition(enum BattlerPosition position)
     return battler;
 }
 
-static inline u32 GetPartnerBattler(enum BattlerId battler)
+static inline enum BattlerId GetPartnerBattler(enum BattlerId battler)
 {
     return GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(battler)));
 }
 
-static inline u32 GetOppositeBattler(enum BattlerId battler)
+static inline enum BattlerId GetOppositeBattler(enum BattlerId battler)
 {
     return GetBattlerAtPosition(BATTLE_OPPOSITE(GetBattlerPosition(battler)));
 }
 
-static inline u32 GetBattlerSide(enum BattlerId battler)
+static inline enum BattleSide GetBattlerSide(enum BattlerId battler)
 {
     return GetBattlerPosition(battler) & BIT_SIDE;
 }
@@ -1138,7 +1138,7 @@ static inline bool32 IsBattlerAlly(enum BattlerId battlerAtk, enum BattlerId bat
     return GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef);
 }
 
-static inline u32 GetOpposingSideBattler(enum BattlerId battler)
+static inline enum BattlerId GetOpposingSideBattler(enum BattlerId battler)
 {
     return GetBattlerAtPosition(BATTLE_OPPOSITE(GetBattlerSide(battler)));
 }
@@ -1160,7 +1160,7 @@ static inline bool32 IsSpreadMove(enum MoveTarget moveTarget)
     return moveTarget == TARGET_BOTH || moveTarget == TARGET_FOES_AND_ALLY;
 }
 
-static inline u32 GetBattlerChosenMove(enum BattlerId battler)
+static inline enum Move GetBattlerChosenMove(enum BattlerId battler)
 {
     return gBattleMons[battler].moves[gBattleStruct->chosenMovePositions[battler]];
 }

include/battle_scripts.h

@@ -203,6 +203,7 @@ extern const u8 BattleScript_BerryCureStatusRet[];
 extern const u8 BattleScript_BerryCureStatusAndConfusionRet[];
 extern const u8 BattleScript_BerryCureConfusionRet[];
 extern const u8 BattleScript_WhiteHerbRet[];
+extern const u8 BattleScript_WhiteHerbFling[];
 extern const u8 BattleScript_ItemHealHP_RemoveItem[];
 extern const u8 BattleScript_BerryPPHeal[];
 extern const u8 BattleScript_ItemHealHP_Ret[];

include/constants/cries.h

@@ -2398,7 +2398,6 @@ enum PokemonCry
 #endif //P_FAMILY_BOMBIRDIER
 #if P_FAMILY_FINIZEN
     CRY_FINIZEN,
-    CRY_PALAFIN_ZERO,
     CRY_PALAFIN_HERO,
 #endif //P_FAMILY_FINIZEN
 #if P_FAMILY_VAROOM
@@ -2488,7 +2487,8 @@ enum PokemonCry
 #endif //P_MODIFIED_MEGA_CRIES
 #endif //P_FAMILY_FRIGIBAX
 #if P_FAMILY_GIMMIGHOUL
-    CRY_GIMMIGHOUL,
+    CRY_GIMMIGHOUL_CHEST,
+    CRY_GIMMIGHOUL_ROAMING,
     CRY_GHOLDENGO,
 #endif //P_FAMILY_GIMMIGHOUL
 #if P_FAMILY_WO_CHIEN

sound/cry_tables.inc

@@ -1802,7 +1802,7 @@ gCryTable::
 	cry Cry_Goodra
 .endif @ P_FAMILY_GOOMY
 .if P_FAMILY_KLEFKI == TRUE
-	cry_uncomp Cry_Klefki @ Cannot be heard unless we use cry_uncomp here.
+	cry Cry_Klefki
 .endif @ P_FAMILY_KLEFKI
 .if P_FAMILY_PHANTUMP == TRUE
 	cry Cry_Phantump
@@ -1887,7 +1887,7 @@ gCryTable::
 .endif @ P_FAMILY_CRABRAWLER
 .if P_FAMILY_ORICORIO == TRUE
 	cry Cry_OricorioBaile
-	cry_uncomp Cry_OricorioPomPom @ Cannot be heard unless we use cry_uncomp here.
+	cry Cry_OricorioPomPom
 	cry Cry_OricorioPau
 	cry Cry_OricorioSensu
 .endif @ P_FAMILY_ORICORIO
@@ -2395,7 +2395,6 @@ gCryTable::
 .endif @ P_FAMILY_BOMBIRDIER
 .if P_FAMILY_FINIZEN == TRUE
 	cry Cry_Finizen
-	cry Cry_PalafinZero
 	cry Cry_PalafinHero
 .endif @ P_FAMILY_FINIZEN
 .if P_FAMILY_VAROOM == TRUE
@@ -2485,7 +2484,8 @@ gCryTable::
 .endif @ P_MODIFIED_MEGA_CRIES
 .endif @ P_FAMILY_FRIGIBAX
 .if P_FAMILY_GIMMIGHOUL == TRUE
-	cry Cry_Gimmighoul
+	cry Cry_GimmighoulChest
+	cry Cry_GimmighoulRoaming
 	cry Cry_Gholdengo
 .endif @ P_FAMILY_GIMMIGHOUL
 .if P_FAMILY_WO_CHIEN == TRUE
@@ -4358,7 +4358,7 @@ gCryTable_Reverse::
 	cry_reverse Cry_Goodra
 .endif @ P_FAMILY_GOOMY
 .if P_FAMILY_KLEFKI == TRUE
-	cry_reverse_uncomp Cry_Klefki @ Cannot be heard unless we use cry_reverse_uncomp here.
+	cry_reverse Cry_Klefki
 .endif @ P_FAMILY_KLEFKI
 .if P_FAMILY_PHANTUMP == TRUE
 	cry_reverse Cry_Phantump
@@ -4443,7 +4443,7 @@ gCryTable_Reverse::
 .endif @ P_FAMILY_CRABRAWLER
 .if P_FAMILY_ORICORIO == TRUE
 	cry_reverse Cry_OricorioBaile
-	cry_reverse_uncomp Cry_OricorioPomPom @ Cannot be heard unless we use cry_reverse_uncomp here.
+	cry_reverse Cry_OricorioPomPom
 	cry_reverse Cry_OricorioPau
 	cry_reverse Cry_OricorioSensu
 .endif @ P_FAMILY_ORICORIO
@@ -4951,7 +4951,6 @@ gCryTable_Reverse::
 .endif @ P_FAMILY_BOMBIRDIER
 .if P_FAMILY_FINIZEN == TRUE
 	cry_reverse Cry_Finizen
-	cry_reverse Cry_PalafinZero
 	cry_reverse Cry_PalafinHero
 .endif @ P_FAMILY_FINIZEN
 .if P_FAMILY_VAROOM == TRUE
@@ -5041,7 +5040,8 @@ gCryTable_Reverse::
 .endif @ P_MODIFIED_MEGA_CRIES
 .endif @ P_FAMILY_FRIGIBAX
 .if P_FAMILY_GIMMIGHOUL == TRUE
-	cry_reverse Cry_Gimmighoul
+	cry_reverse Cry_GimmighoulChest
+	cry_reverse Cry_GimmighoulRoaming
 	cry_reverse Cry_Gholdengo
 .endif @ P_FAMILY_GIMMIGHOUL
 .if P_FAMILY_WO_CHIEN == TRUE

sound/direct_sound_data.inc

@@ -6267,7 +6267,7 @@ Cry_Goodra::
 	.align 2
 Cry_Klefki::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/uncomp_klefki.bin"
+	.incbin "sound/direct_sound_samples/cries/klefki.bin"
 .endif
 .endif @ P_FAMILY_KLEFKI
 
@@ -6567,7 +6567,7 @@ Cry_OricorioBaile::
 	.align 2
 Cry_OricorioPomPom::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.bin"
+	.incbin "sound/direct_sound_samples/cries/oricorio_pom_pom.bin"
 .endif
 
 	.align 2
@@ -7604,13 +7604,13 @@ Cry_Stonjourner::
 	.align 2
 Cry_EiscueIce::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/eiscue_ice_face.bin"
+	.incbin "sound/direct_sound_samples/cries/eiscue_ice.bin"
 .endif
 
 	.align 2
 Cry_EiscueNoice::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/eiscue_noice_face.bin"
+	.incbin "sound/direct_sound_samples/cries/eiscue_noice.bin"
 .endif
 .endif @ P_FAMILY_EISCUE
 
@@ -7618,13 +7618,13 @@ Cry_EiscueNoice::
 	.align 2
 Cry_IndeedeeM::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/indeedee_male.bin"
+	.incbin "sound/direct_sound_samples/cries/indeedee_m.bin"
 .endif
 
 	.align 2
 Cry_IndeedeeF::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/indeedee_female.bin"
+	.incbin "sound/direct_sound_samples/cries/indeedee_f.bin"
 .endif
 .endif @ P_FAMILY_INDEEDEE
 
@@ -7726,13 +7726,13 @@ Cry_Dragapult::
 	.align 2
 Cry_ZacianHero::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/zacian_hero_of_many_battles.bin"
+	.incbin "sound/direct_sound_samples/cries/zacian_hero.bin"
 .endif
 
 	.align 2
 Cry_ZacianCrowned::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/zacian_crowned_sword.bin"
+	.incbin "sound/direct_sound_samples/cries/zacian_crowned.bin"
 .endif
 .endif @ P_FAMILY_ZACIAN
 
@@ -7740,13 +7740,13 @@ Cry_ZacianCrowned::
 	.align 2
 Cry_ZamazentaHero::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.bin"
+	.incbin "sound/direct_sound_samples/cries/zamazenta_hero.bin"
 .endif
 
 	.align 2
 Cry_ZamazentaCrowned::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/zamazenta_crowned_shield.bin"
+	.incbin "sound/direct_sound_samples/cries/zamazenta_crowned.bin"
 .endif
 .endif @ P_FAMILY_ZAMAZENTA
 
@@ -8282,12 +8282,6 @@ Cry_Finizen::
 	.incbin "sound/direct_sound_samples/cries/finizen.bin"
 .endif
 
-	.align 2
-Cry_PalafinZero::
-.if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/palafin_zero.bin"
-.endif
-
 	.align 2
 Cry_PalafinHero::
 .if TESTING == FALSE
@@ -8553,9 +8547,15 @@ Cry_BaxcaliburMega::
 
 .if P_FAMILY_GIMMIGHOUL == TRUE
 	.align 2
-Cry_Gimmighoul::
+Cry_GimmighoulChest::
 .if TESTING == FALSE
-	.incbin "sound/direct_sound_samples/cries/gimmighoul.bin"
+	.incbin "sound/direct_sound_samples/cries/gimmighoul_chest.bin"
+.endif
+
+	.align 2
+Cry_GimmighoulRoaming::
+.if TESTING == FALSE
+	.incbin "sound/direct_sound_samples/cries/gimmighoul_roaming.bin"
 .endif
 
 	.align 2