From f3db4a294d20a020cc0c6838548ca3b0856774cd Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 15 Aug 2023 19:45:33 -0400 Subject: [PATCH] Verify that there aren't too many OAM constants Fixes #1062 --- constants/battle_anim_constants.asm | 3 +++ constants/sprite_anim_constants.asm | 3 +++ macros/scripts/oam_anims.asm | 2 ++ 3 files changed, 8 insertions(+) diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index bf6b45e5a01..b82af5d2114 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -713,6 +713,9 @@ DEF NUM_BATTLEANIMFRAMESETS EQU const_value const BATTLEANIMOAMSET_D7 DEF NUM_BATTLEANIMOAMSETS EQU const_value +assert NUM_BATTLEANIMOAMSETS <= FIRST_OAM_CMD, \ + "BATTLEANIMOAMSET_* constants overlap oam*_command constants" + ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) const_def 1 const ANIM_BG_FLASH_INVERTED diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 96bc9a6e89b..c46ad9726d6 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -342,3 +342,6 @@ DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_GREEN_1 ; 8e const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_GREEN_2 ; 8f DEF NUM_SPRITE_ANIM_OAMSETS EQU const_value + +assert NUM_SPRITE_ANIM_OAMSETS <= FIRST_OAM_CMD, \ + "SPRITE_ANIM_OAMSET_* constants overlap oam*_command constants" diff --git a/macros/scripts/oam_anims.asm b/macros/scripts/oam_anims.asm index f3fa9bfbe4d..2bd751cfbc4 100644 --- a/macros/scripts/oam_anims.asm +++ b/macros/scripts/oam_anims.asm @@ -36,3 +36,5 @@ ENDM MACRO oamdelete db oamdelete_command ENDM + +DEF FIRST_OAM_CMD EQU LOW(const_value + 1)