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

Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor

Browse Source
This commit is contained in:
camthesaxman
2018-01-21 22:29:35 -06:00
parent a78b0636f5 f57340b729
commit 663ecd0014
1804 changed files with 46206 additions and 19652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
asm/macros/event.inc
View File

@@ -262,6 +262,13 @@
.2byte \output
.2byte SPECIAL_\function
.endm
@ temporary solution
.macro specialvar_ output, functionId
.byte 0x26
.2byte \output
.2byte \functionId
.endm
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
.macro waitstate

2
asm/macros/window.inc
View File

@@ -8,7 +8,7 @@
.2byte \vram_tile_offset
.endm
.macro window_template_terminator
.macro null_window_template
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm