Merge pull request #598 from mid-kid/temp

BATTLEANIMSTRUCT_0B -> BATTLEANIMSTRUCT_PARAM
This commit is contained in:
Rangi 2019-02-09 18:04:03 -05:00 committed by GitHub
commit 4819a54b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 133 additions and 126 deletions

View File

@ -11,7 +11,7 @@
const BATTLEANIMSTRUCT_YCOORD
const BATTLEANIMSTRUCT_XOFFSET
const BATTLEANIMSTRUCT_YOFFSET
const BATTLEANIMSTRUCT_0B
const BATTLEANIMSTRUCT_PARAM
const BATTLEANIMSTRUCT_DURATION
const BATTLEANIMSTRUCT_FRAME
const BATTLEANIMSTRUCT_ANON_JT_INDEX

View File

@ -601,7 +601,7 @@ BattleAnimCmd_Obj:
call GetBattleAnimByte
ld [wBattleObjectTempYCoord], a
call GetBattleAnimByte
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call QueueBattleAnimation
ret

View File

@ -440,7 +440,7 @@ BattleBGEffect_BattlerObj_1Row:
ld a, 8 * TILE_WIDTH
ld [wBattleObjectTempYCoord], a
xor a
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call _QueueBattleAnimation
pop bc
ret
@ -507,7 +507,7 @@ BattleBGEffect_BattlerObj_2Row:
ld a, 8 * TILE_WIDTH
ld [wBattleObjectTempYCoord], a
xor a
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call _QueueBattleAnimation
pop bc
ret

View File

@ -65,8 +65,8 @@ endr
xor a
ld [hli], a ; X Offset
ld [hli], a ; Y Offset
ld a, [wBattleObjectTemp0b]
ld [hli], a ; 0b
ld a, [wBattleObjectTempParam]
ld [hli], a ; Param
xor a
ld [hli], a ; 0c
dec a

File diff suppressed because it is too large Load Diff

View File

@ -3067,7 +3067,7 @@ NEXTU ; d419
wBattleObjectTempID:: db
wBattleObjectTempXCoord:: db
wBattleObjectTempYCoord:: db
wBattleObjectTemp0b:: db
wBattleObjectTempParam:: db
NEXTU ; d419
wBattleAnimTempOAMFlags:: db