diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/event.asm | 7 | ||||
| -rw-r--r-- | macros/move_anim.asm | 1 | ||||
| -rw-r--r-- | macros/movement.asm | 1 | ||||
| -rw-r--r-- | macros/sound.asm | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/macros/event.asm b/macros/event.asm index fe41050c9..893d55fe6 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -287,6 +287,10 @@ checktime: macro db \1 ; time endm +checkmorn EQUS "checktime 1" +checkday EQUS "checktime 2" +checknite EQUS "checktime 4" + enum checkpoke_command checkpoke: macro db checkpoke_command @@ -765,7 +769,8 @@ earthquake: macro enum changemap_command changemap: macro db changemap_command - dw \1 ; map_data_pointer + db \1 ; map_bank + dw \2 ; map_data_pointer endm enum changeblock_command diff --git a/macros/move_anim.asm b/macros/move_anim.asm index 962324bc6..f14fea7b7 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -241,4 +241,3 @@ anim_call: macro anim_ret: macro db $ff endm - diff --git a/macros/movement.asm b/macros/movement.asm index a78d532da..1d556f922 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -283,4 +283,3 @@ step_shake: macro db $55 db \1 ; displacement endm - diff --git a/macros/sound.asm b/macros/sound.asm index 8b8de34b2..ae1c192fb 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -227,4 +227,3 @@ callchannel: macro endchannel: macro db $ff endm - |