From 467ee7ee721845533427e4d1d80a4de4055b8851 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sat, 15 Mar 2025 01:03:28 -0400 Subject: [PATCH] Sync further with pokegold --- constants/battle_anim_constants.asm | 2 +- engine/events/treemons.asm | 1 + macros/scripts/pic_anims.asm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 369c9947b..a7d684748 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -818,7 +818,7 @@ DEF NUM_BATTLE_BG_EFFECTS EQU const_value - 1 const BATTLE_ANIM_GFX_WAVE ; 26 const BATTLE_ANIM_GFX_AEROBLAST ; 27 const BATTLE_ANIM_GFX_PLAYERHEAD ; 28 - const BATTLE_ANIM_GFX_ENEMYFEET ; 29 + const BATTLE_ANIM_GFX_ENEMYFEET ; 29 DEF NUM_BATTLE_ANIM_GFX EQU const_value - 1 ; battle_bg_effect struct members (see macros/ram.asm) diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm index 804f7d666..2f58a3cec 100644 --- a/engine/events/treemons.asm +++ b/engine/events/treemons.asm @@ -100,6 +100,7 @@ GetTreeMons: cp NUM_TREEMON_SETS jr nc, .quit + assert TREEMON_SET_CITY == 0 and a jr z, .quit diff --git a/macros/scripts/pic_anims.asm b/macros/scripts/pic_anims.asm index 45320460b..4aea2535d 100644 --- a/macros/scripts/pic_anims.asm +++ b/macros/scripts/pic_anims.asm @@ -11,6 +11,7 @@ ENDM const_def -1, -1 const endanim_command ; $ff + assert endanim_command == oamend_command ; LEGACY: Support for the old name of "oamend" MACRO endanim db endanim_command ENDM