diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-22 20:27:23 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-22 21:30:11 -0400 |
| commit | 2d51993b097401a26551b051f414c51071ab81ef (patch) | |
| tree | 9a89d058b5e53938aa1ba045c7771c3b6ce3bd2e /engine/overworld/scripting.asm | |
| parent | 0d681c25b99db305c251191fe8ae1c32bed4abc5 (diff) | |
Identify remaining map object labels
Diffstat (limited to 'engine/overworld/scripting.asm')
| -rw-r--r-- | engine/overworld/scripting.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 4d395c63..19fd15db 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -34,7 +34,7 @@ WaitScript: dec [hl] ret nz - farcall Function582f + farcall UnfreezeAllObjects ld a, SCRIPT_READ ld [wScriptMode], a @@ -48,7 +48,7 @@ WaitScriptMovement: bit 7, [hl] ret nz - farcall Function582f + farcall UnfreezeAllObjects ld a, SCRIPT_READ ld [wScriptMode], a @@ -748,11 +748,11 @@ Script_applymovement: ApplyMovement: push bc ld a, c - farcall SetFlagsForMovement_1 + farcall FreezeAllOtherObjects pop bc push bc - call SetFlagsForMovement_2 + call UnfreezeFollowerObject pop bc call GetScriptByte @@ -769,8 +769,8 @@ ApplyMovement: call StopScript ret -SetFlagsForMovement_2: - farcall _SetFlagsForMovement_2 +UnfreezeFollowerObject: + farcall _UnfreezeFollowerObject ret Script_applymovementlasttalked: |