ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1394 from GriffinRichards/fix-bgevent

Browse Source 
Fix bg event macros
This commit is contained in:
GriffinR 2021-04-01 14:22:48 -04:00 committed by GitHub
commit 21fd6827b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/macros/map.inc
View File

@ -51,25 +51,25 @@
inc _num_traps inc _num_traps
.endm .endm
.macro bg_event x, y, elevation, kind, arg6, arg7, arg8 .macro bg_event x, y, elevation, kind, arg6, arg7
.2byte \x, \y .2byte \x, \y
.byte \elevation, \kind .byte \elevation, \kind
.2byte 0 .2byte 0
.if \kind < 5 .if \kind != BG_EVENT_HIDDEN_ITEM
.4byte \arg6 .4byte \arg6
.else .else
.2byte \arg6 .2byte \arg6
.byte \arg7, \arg8 .2byte \arg7
.endif .endif
inc _num_signs inc _num_signs
.endm .endm
.macro bg_hidden_item_event x, y, height, item, flag .macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 bg_event \x, \y, \height, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START)
.endm .endm
.macro bg_secret_base_event x, y, height, secret_base_id .macro bg_secret_base_event x, y, height, secret_base_id
bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 bg_event \x, \y, \height, BG_EVENT_SECRET_BASE, \secret_base_id
.endm .endm
.macro map_events npcs, warps, traps, signs .macro map_events npcs, warps, traps, signs