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

Merge pull request #129 from DizzyEggg/dumb_naming

Browse Source 
Name some battle labels
This commit is contained in:
Cameron Hall
2017-12-05 12:05:06 -06:00
committed by GitHub
parent 7597433af6 790df7159e
commit fd75493bc6
14 changed files with 415 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
asm/macros/battle_script.inc
View File

@@ -422,10 +422,10 @@
.byte \bank
.endm
.macro switchinanim bank, param1
.macro switchinanim bank, dontclearsubstitutebit
.byte 0x4e
.byte \bank
.byte \param1
.byte \dontclearsubstitutebit
.endm
.macro jumpifcantswitch bank, param1
@@ -1387,3 +1387,15 @@
.macro jumpifnostatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x1, \jumpptr
.endm
.macro jumpifmovehadnoeffect jumpptr
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
.endm
.macro jumpifbattletype flags, jumpptr
jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm
.macro jumpifnotbattletype flags, jumpptr
jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm