Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verify the battle BG effect pointer table length

Browse Source
This commit is contained in:
Rangi42
2025-03-15 01:23:04 -04:00
parent 467ee7ee72
commit b4fc71cba1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
constants/battle_anim_constants.asm
View File

@@ -719,7 +719,8 @@ assert NUM_BATTLE_ANIM_OAMSETS <= FIRST_OAM_CMD, \
"BATTLE_ANIM_OAMSET_* constants overlap oam*_command constants" "BATTLE_ANIM_OAMSET_* constants overlap oam*_command constants"
; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
const_def 1 const_def
const BATTLE_BG_EFFECT_END ; 00
const BATTLE_BG_EFFECT_FLASH_INVERTED ; 01 const BATTLE_BG_EFFECT_FLASH_INVERTED ; 01
const BATTLE_BG_EFFECT_FLASH_WHITE ; 02 const BATTLE_BG_EFFECT_FLASH_WHITE ; 02
const BATTLE_BG_EFFECT_WHITE_HUES ; 03 const BATTLE_BG_EFFECT_WHITE_HUES ; 03
@@ -773,7 +774,7 @@ assert NUM_BATTLE_ANIM_OAMSETS <= FIRST_OAM_CMD, \
const BATTLE_BG_EFFECT_VIBRATE_MON ; 33 const BATTLE_BG_EFFECT_VIBRATE_MON ; 33
const BATTLE_BG_EFFECT_WOBBLE_PLAYER ; 34 const BATTLE_BG_EFFECT_WOBBLE_PLAYER ; 34
const BATTLE_BG_EFFECT_WOBBLE_SCREEN ; 35 const BATTLE_BG_EFFECT_WOBBLE_SCREEN ; 35
DEF NUM_BATTLE_BG_EFFECTS EQU const_value - 1 DEF NUM_BATTLE_BG_EFFECTS EQU const_value
; wBattleAnimTileDict keys (see wram.asm) ; wBattleAnimTileDict keys (see wram.asm)
; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)

2
engine/battle_anims/bg_effects.asm
View File

@@ -79,6 +79,7 @@ DoBattleBGEffectFunction:
BattleBGEffects: BattleBGEffects:
; entries correspond to BATTLE_BG_EFFECT_* constants ; entries correspond to BATTLE_BG_EFFECT_* constants
table_width 2
dw BattleBGEffect_End dw BattleBGEffect_End
dw BattleBGEffect_FlashInverted dw BattleBGEffect_FlashInverted
dw BattleBGEffect_FlashWhite dw BattleBGEffect_FlashWhite
@@ -133,6 +134,7 @@ BattleBGEffects:
dw BattleBGEffect_VibrateMon dw BattleBGEffect_VibrateMon
dw BattleBGEffect_WobblePlayer dw BattleBGEffect_WobblePlayer
dw BattleBGEffect_WobbleScreen dw BattleBGEffect_WobbleScreen
assert_table_length NUM_BATTLE_BG_EFFECTS
BattleBGEffect_End: BattleBGEffect_End:
call EndBattleBGEffect call EndBattleBGEffect