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

Sync with pokecrystal up to aba1f14

Browse Source
This commit is contained in:
xCrystal
2023-09-24 15:06:19 +02:00
parent 5e78fd1ecc
commit 2cbe0e1764
34 changed files with 4172 additions and 4172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/battle_anims/anim_commands.asm
View File

@@ -116,7 +116,7 @@ RunBattleAnimScript:
cp ROLLOUT
jr nz, .not_rollout
ld a, ANIM_BG_ROLLOUT
ld a, BATTLE_BG_EFFECT_ROLLOUT
ld b, NUM_BG_EFFECTS
ld de, BG_EFFECT_STRUCT_LENGTH
ld hl, wBGEffect1Function
@@ -645,7 +645,7 @@ BattleAnimCmd_ResetObp0:
BattleAnimCmd_ClearObjs:
ld hl, wActiveAnimObjects
ld a, NUM_ANIM_OBJECTS * BATTLEANIMSTRUCT_LENGTH
ld a, NUM_BATTLE_ANIM_STRUCTS * BATTLEANIMSTRUCT_LENGTH
.loop
ld [hl], 0
inc hl
@@ -695,7 +695,7 @@ endr
BattleAnimCmd_IncObj:
call GetBattleAnimByte
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
ld bc, wActiveAnimObjects
.loop
ld hl, BATTLEANIMSTRUCT_INDEX
@@ -745,7 +745,7 @@ BattleAnimCmd_IncBGEffect:
BattleAnimCmd_SetObj:
call GetBattleAnimByte
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
ld bc, wActiveAnimObjects
.loop
ld hl, BATTLEANIMSTRUCT_INDEX
@@ -780,11 +780,11 @@ BattleAnimCmd_BattlerGFX_1Row:
jr .loop
.okay
ld a, ANIM_GFX_PLAYERHEAD
ld a, BATTLE_ANIM_GFX_PLAYERHEAD
ld [hli], a
ld a, ($80 - 6 - 7) - BATTLEANIM_BASE_TILE
ld [hli], a
ld a, ANIM_GFX_ENEMYFEET
ld a, BATTLE_ANIM_GFX_ENEMYFEET
ld [hli], a
ld a, ($80 - 6) - BATTLEANIM_BASE_TILE
ld [hl], a
@@ -834,11 +834,11 @@ BattleAnimCmd_BattlerGFX_2Row:
jr .loop
.okay
ld a, ANIM_GFX_PLAYERHEAD
ld a, BATTLE_ANIM_GFX_PLAYERHEAD
ld [hli], a
ld a, ($80 - 6 * 2 - 7 * 2) - BATTLEANIM_BASE_TILE
ld [hli], a
ld a, ANIM_GFX_ENEMYFEET
ld a, BATTLE_ANIM_GFX_ENEMYFEET
ld [hli], a
ld a, ($80 - 6 * 2) - BATTLEANIM_BASE_TILE
ld [hl], a
@@ -1422,7 +1422,7 @@ BattleAnim_UpdateOAM_All:
ld a, 0
ld [wBattleAnimOAMPointerLo], a
ld hl, wActiveAnimObjects
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
.loop
ld a, [hl]
and a

10
engine/battle_anims/bg_effects.asm
View File

@@ -78,7 +78,7 @@ DoBattleBGEffectFunction:
jp hl
BattleBGEffects:
; entries correspond to ANIM_BG_* constants
; entries correspond to BATTLE_BG_EFFECT_* constants
dw BattleBGEffect_End
dw BattleBGEffect_FlashInverted
dw BattleBGEffect_FlashWhite
@@ -402,13 +402,13 @@ BattleBGEffect_BattlerObj_1Row:
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side
ld a, ANIM_OBJ_ENEMYFEET_1ROW
ld a, BATTLE_ANIM_OBJ_ENEMYFEET_1ROW
ld [wBattleObjectTempID], a
ld a, 16 * TILE_WIDTH + 4
jr .okay
.player_side
ld a, ANIM_OBJ_PLAYERHEAD_1ROW
ld a, BATTLE_ANIM_OBJ_PLAYERHEAD_1ROW
ld [wBattleObjectTempID], a
ld a, 6 * TILE_WIDTH
.okay
@@ -469,13 +469,13 @@ BattleBGEffect_BattlerObj_2Row:
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side
ld a, ANIM_OBJ_ENEMYFEET_2ROW
ld a, BATTLE_ANIM_OBJ_ENEMYFEET_2ROW
ld [wBattleObjectTempID], a
ld a, 16 * TILE_WIDTH + 4
jr .okay
.player_side
ld a, ANIM_OBJ_PLAYERHEAD_2ROW
ld a, BATTLE_ANIM_OBJ_PLAYERHEAD_2ROW
ld [wBattleObjectTempID], a
ld a, 6 * TILE_WIDTH
.okay

2
engine/battle_anims/core.asm
View File

@@ -1,6 +1,6 @@
QueueBattleAnimation:
ld hl, wActiveAnimObjects
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
.loop
ld a, [hl]
and a

444
engine/battle_anims/functions.asm
View File

File diff suppressed because it is too large Load Diff