diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/event.inc | 4 | ||||
| -rw-r--r-- | asm/rom_81D1C44.s | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d8251a358..8b3466fe7 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1163,12 +1163,12 @@ .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x:req, y:req, metatile_number:req, tile_attrib:req + .macro setmetatile x:req, y:req, metatile_number:req, has_collision:req .byte 0xa2 .2byte \x .2byte \y .2byte \metatile_number - .2byte \tile_attrib + .2byte \has_collision .endm @ Queues a weather change to the default weather for the map. diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index 13664a4b2..a9ef8e4f2 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -6500,7 +6500,7 @@ _081D4F6C: bne _081D4F88 movs r0, 0x49 bl PlaySE - bl sub_800A620 + bl CheckShouldAdvanceLinkState movs r0, 0 strh r0, [r5] b _081D4FE6 |