diff options
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/battle_script.inc | 6 | ||||
| -rw-r--r-- | asm/macros/map.inc | 29 |
2 files changed, 26 insertions, 9 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 083107c08..c03d78df7 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -511,7 +511,7 @@ .byte \bank .endm - .macro atk5F + .macro swapattackerwithtarget .byte 0x5f .endm @@ -525,7 +525,7 @@ .byte \bank .endm - .macro atk62 bank + .macro hidepartystatussummary bank .byte 0x62 .byte \bank .endm @@ -1163,7 +1163,7 @@ .4byte \param0 .endm - .macro snatchsetbanks + .macro snatchsetbattlers .byte 0xed .endm diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 69b3629f6..23806b4cc 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -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 |