diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /asm/macros/map.inc | |
parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) |
Merge branch 'master' of github.com:pret/pokefirered into trade
Diffstat (limited to 'asm/macros/map.inc')
-rw-r--r-- | asm/macros/map.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 075993fd3..d903899fe 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -55,8 +55,8 @@ inc _num_signs .endm - .macro bg_hidden_item_event x, y, height, item, flag, unknown - bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown + .macro bg_hidden_item_event x, y, height, item, flag, quantity, underfoot + bg_event \x, \y, \height, 7, 0, \item, \flag, \quantity | (\underfoot << 7) .endm .macro map_events npcs, warps, traps, signs |