Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

rh-hideout · Jun 2, 2024 · ee1d147 · ee1d147
2 parents da91e6a + 4eda5f6
commit ee1d147
Show file tree

Hide file tree

Showing 103 changed files with 5,864 additions and 3,383 deletions.
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
@@ -1352,6 +1352,22 @@
 	.endm
 
 @ callnative macros
+	.macro savetarget
+	callnative BS_SaveTarget
+	.endm
+
+	.macro restoretarget
+	callnative BS_RestoreTarget
+	.endm
+	
+	.macro saveattacker
+	callnative BS_SaveAttacker
+	.endm
+	
+	.macro restoreattacker
+	callnative BS_RestoreAttacker
+	.endm
+	
 	.macro metalburstdamagecalculator failInstr:req
 	callnative BS_CalcMetalBurstDmg
 	.4byte \failInstr
@@ -1774,14 +1790,6 @@
 	various \battler, VARIOUS_SWITCHIN_ABILITIES
 	.endm
 
-	.macro savetarget
-	various BS_TARGET, VARIOUS_SAVE_TARGET
-	.endm
-
-	.macro restoretarget
-	various BS_TARGET, VARIOUS_RESTORE_TARGET
-	.endm
-
 	.macro instanthpdrop battler:req
 	various \battler, VARIOUS_INSTANT_HP_DROP
 	.endm