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

Sync bg_event macros with pokeruby

Browse Source
This commit is contained in:
Marcus Huderle
2018-07-11 11:12:26 -05:00
parent 8ffd7a70fc
commit 7d375972ba
165 changed files with 1251 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
asm/macros/map.inc
View File

@@ -34,18 +34,27 @@
inc _num_warps
.endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
.macro coord_event x, y, elevation, trigger, index, script
.2byte \x, \y
.byte \byte1, \byte2
.2byte \word1, \word2, \word3
.byte \elevation, 0
.2byte \trigger, \index, 0
.4byte \script
inc _num_traps
.endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.macro coord_weather_event x, y, elevation, weather
.2byte \x, \y
.byte \byte, \kind
.2byte \word
.byte \elevation, 0
.2byte \weather
.2byte 0, 0
.4byte 0
inc _num_traps
.endm
.macro bg_event x, y, elevation, kind, arg6, arg7, arg8
.2byte \x, \y
.byte \elevation, \kind
.2byte 0
.if \kind < 5
.4byte \arg6
.else
@@ -55,6 +64,14 @@
inc _num_signs
.endm
.macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, \flag, 0
.endm
.macro bg_secret_base_event x, y, height, secret_base_id
bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
.endm
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs