diff options
| author | Pokeglitch <pokeglitchx@gmail.com> | 2018-06-15 11:44:47 -0400 |
|---|---|---|
| committer | Pokeglitch <pokeglitchx@gmail.com> | 2018-06-15 11:44:47 -0400 |
| commit | 5af2f6fcb01fbd5c5ce8cf639c9cf964188227f9 (patch) | |
| tree | 785efbb0954ee8112793c92a626440f2505a9f38 | |
| parent | d0ef40a60044d4dc69656de670c74b46973aaff7 (diff) | |
Updated script constants
| -rwxr-xr-x | constants/script_constants.asm | 18 | ||||
| -rwxr-xr-x | engine/events/overworld.asm | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 1736d36..3aa19b5 100755 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -1,15 +1,15 @@ -; Teleport Scripts
+; Script IDs
const_def
- const SCRIPT_TRY_TELEPORT ; 00
- const SCRIPT_DO_TELEPORT ; 01
- const SCRIPT_FAIL_TELEPORT ; 02
- const SCRIPT_CHECK_SPAWN_TELEPORT ; 03
+ const SCRIPT_ID_00 ; 00
+ const SCRIPT_ID_01 ; 01
+ const SCRIPT_ID_02 ; 02
+ const SCRIPT_ID_03 ; 03
; Flags
-SCRIPT_FINISHED_FLAG EQU 7
+SCRIPT_FINISHED EQU 7
; Masks/Return Values
-SCRIPT_SUCCESS EQU $f
-SCRIPT_FAIL EQU 0
-SCRIPT_FINISHED EQU 1 << SCRIPT_FINISHED_FLAG
\ No newline at end of file +SCRIPT_FINISHED_MASK = 1 << SCRIPT_FINISHED
+SCRIPT_SUCCESS EQU SCRIPT_FINISHED_MASK | $f
+SCRIPT_FAIL EQU SCRIPT_FINISHED_MASK | 0
\ No newline at end of file diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 3090d1b..da5c0ba 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -8,7 +8,7 @@ TeleportFunction: ; 03:52db ld [wFieldMoveScriptID], a
.loop
ld a, [wFieldMoveScriptID]
- bit SCRIPT_FINISHED_FLAG, a
+ bit SCRIPT_FINISHED, a
jr nz, .finish
ld hl, .JumpTable
call CallJumptable
@@ -16,7 +16,7 @@ TeleportFunction: ; 03:52db ; Finish by returning only the low nibble
.finish
- and $FF - SCRIPT_FINISHED
+ and $FF - SCRIPT_FINISHED_MASK
ld [wFieldMoveSucceeded], a
ret
@@ -32,11 +32,11 @@ TeleportFunction: ; 03:52db jr z, .success
cp ROUTE
jr z, .success
- ld a, SCRIPT_FAIL_TELEPORT
+ ld a, SCRIPT_ID_02
ld [wFieldMoveScriptID], a
ret
.success
- ld a, SCRIPT_CHECK_SPAWN_TELEPORT
+ ld a, SCRIPT_ID_03
ld [wFieldMoveScriptID], a
ret
@@ -49,13 +49,13 @@ TeleportFunction: ; 03:52db jr c, .not_spawn
ld hl, .Text_CantFindDestination
call MenuTextBoxBackup
- ld a, SCRIPT_FINISHED | SCRIPT_FAIL
+ ld a, SCRIPT_FAIL
ld [wFieldMoveScriptID], a
ret
.not_spawn
ld a, c
ld [wDefaultSpawnpoint], a
- ld a, SCRIPT_DO_TELEPORT
+ ld a, SCRIPT_ID_01
ld [wFieldMoveScriptID], a
ret
@@ -68,14 +68,14 @@ TeleportFunction: ; 03:52db ldh a, [hROMBank]
ld hl, .TeleportScript
call QueueScript
- ld a, SCRIPT_FINISHED | SCRIPT_SUCCESS
+ ld a, SCRIPT_SUCCESS
ld [wFieldMoveScriptID], a
ret
.FailTeleport: ; 03:5359
ld hl, .Text_CantUseHere
call MenuTextBoxBackup
- ld a, SCRIPT_FINISHED | SCRIPT_FAIL
+ ld a, SCRIPT_FAIL
ld [wFieldMoveScriptID], a
scf
ret
|