pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #598 from mid-kid/temp

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/battle_anim_constants.asm
View File

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

2
engine/battle_anims/anim_commands.asm
View File

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

4
engine/battle_anims/bg_effects.asm
View File

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

4
engine/battle_anims/core.asm
View File

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

245
engine/battle_anims/functions.asm
View File

File diff suppressed because it is too large Load Diff

2
wram.asm
View File

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