Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030

# Conflicts:
#	src/rom_header_gf.c

asm/macros/battle_script.inc

@@ -1290,7 +1290,7 @@
 	.4byte \ptr
 	.endm
 
-	.macro trygetbaddreamstarget ptr:req
+	.macro unused ptr:req
 	.byte 0xfd
 	.4byte \ptr
 	.endm
@@ -1789,9 +1789,9 @@
 	various BS_ATTACKER, VARIOUS_SET_Z_EFFECT
 	.endm
 
-	.macro consumeberry battler:req, restoreItem=FALSE
+	.macro consumeberry battler:req, frombattler:req
 	various \battler, VARIOUS_CONSUME_BERRY
-	.byte \restoreItem
+	.byte \frombattler
 	.endm
 
 	.macro activateitemeffects battler:req
@@ -1988,6 +1988,12 @@
 	various \battler, VARIOUS_GET_BATTLER_SIDE
 	.endm
 
+	.macro checkparentalbondcounter counter:req, ptr:req
+	various BS_ATTACKER, VARIOUS_CHECK_PARENTAL_BOND_COUNTER
+	.byte \counter
+	.4byte \ptr
+	.endm
+
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7