dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim

Browse Source
This commit is contained in:
GriffinR
2022-08-23 10:47:07 -04:00
parent b3590324b8 feb3d9cbab
commit a5853a71bd
33 changed files with 777 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+6 -6
View File
@@ -1282,16 +1282,16 @@
various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
.endm
.macro various8 battler:req
various \battler, 8
.macro getbattlersforrecall
various BS_ATTACKER, VARIOUS_GET_BATTLERS_FOR_RECALL
.endm
.macro returnopponentmon1toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON1
.macro returnopponentmon1toball
various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON1
.endm
.macro returnopponentmon2toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON2
.macro returnopponentmon2toball
various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON2
.endm
.macro checkpokeflute battler:req