pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use CMDQUEUE constants

Browse Source
This commit is contained in:
Rangi 2020-02-04 11:11:43 -05:00
parent d482dc28f4
commit 24a23b1922
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/script_constants.asm
View File

@ -138,6 +138,7 @@ OBJECT_EVENT_SIZE EQU 13 ; object_event
; command queue members ; command queue members
CMDQUEUE_TYPE EQU 0 CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1 CMDQUEUE_ADDR EQU 1
CMDQUEUE_02 EQU 2
CMDQUEUE_03 EQU 3 CMDQUEUE_03 EQU 3
CMDQUEUE_04 EQU 4 CMDQUEUE_04 EQU 4
CMDQUEUE_05 EQU 5 CMDQUEUE_05 EQU 5

18
engine/overworld/events.asm
View File

@ -1509,20 +1509,20 @@ CmdQueue_Type4:
.zero .zero
ldh a, [hSCY] ldh a, [hSCY]
ld hl, 4 ld hl, CMDQUEUE_04
add hl, bc add hl, bc
ld [hl], a ld [hl], a
call CmdQueueAnonJT_Increment call CmdQueueAnonJT_Increment
.one .one
ld hl, 1 ld hl, CMDQUEUE_ADDR
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
dec a dec a
ld [hl], a ld [hl], a
jr z, .finish jr z, .finish
and $1 and 1
jr z, .add jr z, .add
ld hl, 2 ld hl, CMDQUEUE_02
add hl, bc add hl, bc
ldh a, [hSCY] ldh a, [hSCY]
sub [hl] sub [hl]
@ -1530,7 +1530,7 @@ CmdQueue_Type4:
ret ret
.add .add
ld hl, 2 ld hl, CMDQUEUE_02
add hl, bc add hl, bc
ldh a, [hSCY] ldh a, [hSCY]
add [hl] add [hl]
@ -1538,7 +1538,7 @@ CmdQueue_Type4:
ret ret
.finish .finish
ld hl, 4 ld hl, CMDQUEUE_04
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ldh [hSCY], a ldh [hSCY], a
@ -1561,7 +1561,7 @@ CmdQueue_Type3:
jr z, .PlayerNotFacingDown jr z, .PlayerNotFacingDown
call CmdQueueAnonJT_Increment call CmdQueueAnonJT_Increment
ld hl, 2 ld hl, CMDQUEUE_02
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wd173], a ld [wd173], a
@ -1572,7 +1572,7 @@ CmdQueue_Type3:
jr z, .PlayerNotFacingDown jr z, .PlayerNotFacingDown
call CmdQueueAnonJT_Decrement call CmdQueueAnonJT_Decrement
ld hl, 3 ld hl, CMDQUEUE_03
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wd173], a ld [wd173], a
@ -1581,7 +1581,7 @@ CmdQueue_Type3:
.PlayerNotFacingDown: .PlayerNotFacingDown:
ld a, $7f ld a, $7f
ld [wd173], a ld [wd173], a
ld hl, 5 ld hl, CMDQUEUE_05
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0
ret ret