diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/event.inc | 3 | ||||
| -rw-r--r-- | asm/macros/movement.inc | 2 | ||||
| -rw-r--r-- | asm/script_menu.s | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 2e5b839c3..11ec30d74 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -653,6 +653,9 @@ .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script + .elseif \type == 9 + .4byte \pointer1 @ text + .4byte \pointer2 @ text .endif .endm diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 909b24916..ac7b6ea9f 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -5,7 +5,7 @@ .endm .endm - enum_start + enum_start 0 create_movement step_00 create_movement step_01 create_movement step_02 diff --git a/asm/script_menu.s b/asm/script_menu.s index eaf874aea..63caa179f 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -1732,7 +1732,7 @@ sub_809D6B0: @ 809D6B0 thumb_func_start sub_809D6D4 sub_809D6D4: @ 809D6D4 push {lr} - ldr r0, _0809D74C @ =gUnknown_81A7AE0 + ldr r0, _0809D74C @ =EventScript_1A7AE0 bl ScriptContext1_SetupScript ldr r0, _0809D750 @ =sub_809D288 bl FindTaskIdByFunc @@ -1788,7 +1788,7 @@ _0809D748: pop {r0} bx r0 .align 2, 0 -_0809D74C: .4byte gUnknown_81A7AE0 +_0809D74C: .4byte EventScript_1A7AE0 _0809D750: .4byte sub_809D288 _0809D754: .4byte gTasks+0x8 _0809D758: .4byte gSprites |