Skip to content

Commit 467ee7e

Browse files
committed
Sync further with pokegold
1 parent 94c36a4 commit 467ee7e

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

constants/battle_anim_constants.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ DEF NUM_BATTLE_BG_EFFECTS EQU const_value - 1
818818
const BATTLE_ANIM_GFX_WAVE ; 26
819819
const BATTLE_ANIM_GFX_AEROBLAST ; 27
820820
const BATTLE_ANIM_GFX_PLAYERHEAD ; 28
821-
const BATTLE_ANIM_GFX_ENEMYFEET ; 29
821+
const BATTLE_ANIM_GFX_ENEMYFEET ; 29
822822
DEF NUM_BATTLE_ANIM_GFX EQU const_value - 1
823823

824824
; battle_bg_effect struct members (see macros/ram.asm)

engine/events/treemons.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ GetTreeMons:
100100
cp NUM_TREEMON_SETS
101101
jr nc, .quit
102102

103+
assert TREEMON_SET_CITY == 0
103104
and a
104105
jr z, .quit
105106

macros/scripts/pic_anims.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ENDM
1111
const_def -1, -1
1212

1313
const endanim_command ; $ff
14+
assert endanim_command == oamend_command ; LEGACY: Support for the old name of "oamend"
1415
MACRO endanim
1516
db endanim_command
1617
ENDM

0 commit comments

Comments
 (0)