Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

rh-hideout · Jan 20, 2025 · a756bb5 · a756bb5
2 parents d1fc3d7 + f6a86a6
commit a756bb5
Show file tree

Hide file tree

Showing 78 changed files with 9,055 additions and 8,720 deletions.
diff --git 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]