dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-overworld

Browse Source
This commit is contained in:
GriffinR
2020-07-18 20:24:09 -04:00
committed by GitHub
parent e129d04b93 8e6dd3bafe
commit af09e73d67
247 changed files with 4787 additions and 4035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+6 -6
View File
@@ -1263,8 +1263,8 @@
various \battler, VARIOUS_GET_MOVE_TARGET
.endm
.macro various4 battler:req
various \battler, 4
.macro getbattlerfainted battler:req
various \battler, VARIOUS_GET_BATTLER_FAINTED
.endm
.macro resetintimidatetracebits battler:req
@@ -1279,8 +1279,8 @@
various \battler, 7
.endm
.macro various8 battler:req
various \battler, 8
.macro palaceflavortext battler:req
various \battler, VARIOUS_PALACE_FLAVOR_TEXT
.endm
.macro arenajudgmentwindow
@@ -1365,11 +1365,11 @@
.endm
.macro chosenstatus1animation battler:req, status:req
chosenstatusanimation \battler 0x0 \status
chosenstatusanimation \battler, 0x0, \status
.endm
.macro chosenstatus2animation battler:req, status:req
chosenstatusanimation \battler 0x1 \status
chosenstatusanimation \battler, 0x1, \status
.endm
.macro sethword dst:req, value:req