Sync with pokecrystal up to aba1f14

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

File diff suppressed because it is too large Load Diff

View File

@@ -33,105 +33,105 @@ DEF NUM_SPRITE_ANIM_GFX EQU const_value
; wSpriteAnimDict size (see wram.asm) ; wSpriteAnimDict size (see wram.asm)
DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10 DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10
; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm) ; SpriteAnimObjects indexes (see data/sprite_anims/objects.asm)
const_def const_def
const SPRITE_ANIM_INDEX_PARTY_MON ; 00 const SPRITE_ANIM_OBJ_PARTY_MON ; 00
const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ; 01 const SPRITE_ANIM_OBJ_GS_TITLE_TRAIL ; 01
const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR ; 02 const SPRITE_ANIM_OBJ_NAMING_SCREEN_CURSOR ; 02
const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO ; 03 const SPRITE_ANIM_OBJ_GAMEFREAK_LOGO ; 03
const SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR ; 04 const SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_STAR ; 04
const SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE ; 05 const SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_SPARKLE ; 05
const SPRITE_ANIM_INDEX_SLOTS_GOLEM ; 06 const SPRITE_ANIM_OBJ_SLOTS_GOLEM ; 06
const SPRITE_ANIM_INDEX_SLOTS_CHANSEY ; 07 const SPRITE_ANIM_OBJ_SLOTS_CHANSEY ; 07
const SPRITE_ANIM_INDEX_SLOTS_EGG ; 08 const SPRITE_ANIM_OBJ_SLOTS_EGG ; 08
const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ; 09 const SPRITE_ANIM_OBJ_COMPOSE_MAIL_CURSOR ; 09
const SPRITE_ANIM_INDEX_RED_WALK ; 0a const SPRITE_ANIM_OBJ_RED_WALK ; 0a
const SPRITE_ANIM_INDEX_UNUSED_CURSOR ; 0b const SPRITE_ANIM_OBJ_UNUSED_CURSOR ; 0b
const SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR ; 0c const SPRITE_ANIM_OBJ_MEMORY_GAME_CURSOR ; 0c
const SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; 0d const SPRITE_ANIM_OBJ_POKEGEAR_ARROW ; 0d
const SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; 0e const SPRITE_ANIM_OBJ_TRADE_POKE_BALL ; 0e
const SPRITE_ANIM_INDEX_TRADE_POOF ; 0f const SPRITE_ANIM_OBJ_TRADE_POOF ; 0f
const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE ; 10 const SPRITE_ANIM_OBJ_TRADE_TUBE_BULGE ; 10
const SPRITE_ANIM_INDEX_TRADEMON_ICON ; 11 const SPRITE_ANIM_OBJ_TRADEMON_ICON ; 11
const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE ; 12 const SPRITE_ANIM_OBJ_TRADEMON_BUBBLE ; 12
const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13 const SPRITE_ANIM_OBJ_EVOLUTION_BALL_OF_LIGHT ; 13
const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB ; 14 const SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB ; 14
const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED ; 15 const SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED ; 15
const SPRITE_ANIM_INDEX_LEAF ; 16 const SPRITE_ANIM_OBJ_LEAF ; 16
const SPRITE_ANIM_INDEX_CUT_TREE ; 17 const SPRITE_ANIM_OBJ_CUT_TREE ; 17
const SPRITE_ANIM_INDEX_FLY_LEAF ; 18 const SPRITE_ANIM_OBJ_FLY_LEAF ; 18
const SPRITE_ANIM_INDEX_EGG_CRACK ; 19 const SPRITE_ANIM_OBJ_EGG_CRACK ; 19
const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA ; 1a const SPRITE_ANIM_OBJ_GS_INTRO_HO_OH_LUGIA ; 1a
const SPRITE_ANIM_INDEX_HEADBUTT ; 1b const SPRITE_ANIM_OBJ_HEADBUTT ; 1b
const SPRITE_ANIM_INDEX_EGG_HATCH ; 1c const SPRITE_ANIM_OBJ_EGG_HATCH ; 1c
const SPRITE_ANIM_INDEX_EZCHAT_CURSOR ; 1d const SPRITE_ANIM_OBJ_EZCHAT_CURSOR ; 1d
const SPRITE_ANIM_INDEX_BLUE_WALK ; 1e const SPRITE_ANIM_OBJ_BLUE_WALK ; 1e
const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE ; 1f const SPRITE_ANIM_OBJ_MAGNET_TRAIN_BLUE ; 1f
const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL ; 20 const SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_BALL ; 20
const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ; 21 const SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_BALL ; 21
const SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ; 22 const SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE ; 22
const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE ; 23 const SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_PULSE ; 23
const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ; 24 const SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_PULSE ; 24
const SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ; 25 const SPRITE_ANIM_OBJ_MOBILE_TRADE_PING ; 25
const SPRITE_ANIM_INDEX_INTRO_SUICUNE ; 26 const SPRITE_ANIM_OBJ_INTRO_SUICUNE ; 26
const SPRITE_ANIM_INDEX_INTRO_PICHU ; 27 const SPRITE_ANIM_OBJ_INTRO_PICHU ; 27
const SPRITE_ANIM_INDEX_INTRO_WOOPER ; 28 const SPRITE_ANIM_OBJ_INTRO_WOOPER ; 28
const SPRITE_ANIM_INDEX_INTRO_UNOWN ; 29 const SPRITE_ANIM_OBJ_INTRO_UNOWN ; 29
const SPRITE_ANIM_INDEX_INTRO_UNOWN_F ; 2a const SPRITE_ANIM_OBJ_INTRO_UNOWN_F ; 2a
const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ; 2b const SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY ; 2b
const SPRITE_ANIM_INDEX_CELEBI ; 2c const SPRITE_ANIM_OBJ_CELEBI ; 2c
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_DOWN ; 2d const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_DOWN ; 2d
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN ; 2e const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN ; 2e
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_UP ; 2f const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_UP ; 2f
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_UP ; 30 const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_UP ; 30
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_LEFT ; 31 const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_LEFT ; 31
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT ; 32 const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT ; 32
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT ; 33 const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT ; 33
const SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT ; 34 const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT ; 34
DEF NUM_SPRITE_ANIM_INDEXES EQU const_value DEF NUM_SPRITE_ANIM_OBJS EQU const_value
; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm) ; DoSpriteAnimFrame.Jumptable indexes (see engine/sprite_anims/functions.asm)
const_def const_def
const SPRITE_ANIM_SEQ_NULL ; 00 const SPRITE_ANIM_FUNC_NULL ; 00
const SPRITE_ANIM_SEQ_PARTY_MON ; 01 const SPRITE_ANIM_FUNC_PARTY_MON ; 01
const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH ; 02 const SPRITE_ANIM_FUNC_PARTY_MON_SWITCH ; 02
const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED ; 03 const SPRITE_ANIM_FUNC_PARTY_MON_SELECTED ; 03
const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL ; 04 const SPRITE_ANIM_FUNC_GS_TITLE_TRAIL ; 04
const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05 const SPRITE_ANIM_FUNC_NAMING_SCREEN_CURSOR ; 05
const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO ; 06 const SPRITE_ANIM_FUNC_GAMEFREAK_LOGO ; 06
const SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_STAR ; 07 const SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_STAR ; 07
const SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_SPARKLE ; 08 const SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_SPARKLE ; 08
const SPRITE_ANIM_SEQ_SLOTS_GOLEM ; 09 const SPRITE_ANIM_FUNC_SLOTS_GOLEM ; 09
const SPRITE_ANIM_SEQ_SLOTS_CHANSEY ; 0a const SPRITE_ANIM_FUNC_SLOTS_CHANSEY ; 0a
const SPRITE_ANIM_SEQ_SLOTS_EGG ; 0b const SPRITE_ANIM_FUNC_SLOTS_EGG ; 0b
const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 0c const SPRITE_ANIM_FUNC_MAIL_CURSOR ; 0c
const SPRITE_ANIM_SEQ_UNUSED_CURSOR ; 0d const SPRITE_ANIM_FUNC_UNUSED_CURSOR ; 0d
const SPRITE_ANIM_SEQ_MEMORY_GAME_CURSOR ; 0e const SPRITE_ANIM_FUNC_MEMORY_GAME_CURSOR ; 0e
const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 0f const SPRITE_ANIM_FUNC_POKEGEAR_ARROW ; 0f
const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 10 const SPRITE_ANIM_FUNC_TRADE_POKE_BALL ; 10
const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 11 const SPRITE_ANIM_FUNC_TRADE_TUBE_BULGE ; 11
const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE ; 12 const SPRITE_ANIM_FUNC_TRADEMON_IN_TUBE ; 12
const SPRITE_ANIM_SEQ_REVEAL_NEW_MON ; 13 const SPRITE_ANIM_FUNC_REVEAL_NEW_MON ; 13
const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB ; 14 const SPRITE_ANIM_FUNC_RADIO_TUNING_KNOB ; 14
const SPRITE_ANIM_SEQ_CUT_LEAVES ; 15 const SPRITE_ANIM_FUNC_CUT_LEAVES ; 15
const SPRITE_ANIM_SEQ_FLY_FROM ; 16 const SPRITE_ANIM_FUNC_FLY_FROM ; 16
const SPRITE_ANIM_SEQ_FLY_LEAF ; 17 const SPRITE_ANIM_FUNC_FLY_LEAF ; 17
const SPRITE_ANIM_SEQ_FLY_TO ; 18 const SPRITE_ANIM_FUNC_FLY_TO ; 18
const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA ; 19 const SPRITE_ANIM_FUNC_GS_INTRO_HO_OH_LUGIA ; 19
const SPRITE_ANIM_SEQ_EZCHAT_CURSOR ; 1a const SPRITE_ANIM_FUNC_EZCHAT_CURSOR ; 1a
const SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE ; 1b const SPRITE_ANIM_FUNC_MOBILE_TRADE_SENT_PULSE ; 1b
const SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE ; 1c const SPRITE_ANIM_FUNC_MOBILE_TRADE_OT_PULSE ; 1c
const SPRITE_ANIM_SEQ_INTRO_SUICUNE ; 1d const SPRITE_ANIM_FUNC_INTRO_SUICUNE ; 1d
const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER ; 1e const SPRITE_ANIM_FUNC_INTRO_PICHU_WOOPER ; 1e
const SPRITE_ANIM_SEQ_CELEBI ; 1f const SPRITE_ANIM_FUNC_CELEBI ; 1f
const SPRITE_ANIM_SEQ_INTRO_UNOWN ; 20 const SPRITE_ANIM_FUNC_INTRO_UNOWN ; 20
const SPRITE_ANIM_SEQ_INTRO_UNOWN_F ; 21 const SPRITE_ANIM_FUNC_INTRO_UNOWN_F ; 21
const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY ; 22 const SPRITE_ANIM_FUNC_INTRO_SUICUNE_AWAY ; 22
const SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN ; 23 const SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN ; 23
const SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_UP ; 24 const SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP ; 24
const SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_LEFT ; 25 const SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT ; 25
const SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_RIGHT ; 26 const SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT ; 26
DEF NUM_SPRITE_ANIM_SEQS EQU const_value DEF NUM_SPRITE_ANIM_FUNCS EQU const_value
; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm) ; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
const_def const_def

File diff suppressed because it is too large Load Diff

View File

@@ -5,225 +5,225 @@ MACRO battleanimoam
ENDM ENDM
BattleAnimOAMData: BattleAnimOAMData:
; entries correspond to BATTLEANIMOAMSET_* constants ; entries correspond to BATTLE_ANIM_OAMSET_* constants
table_width 4, BattleAnimOAMData table_width 4, BattleAnimOAMData
battleanimoam $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00 battleanimoam $00, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_00
battleanimoam $04, 9, .OAMData_01 ; BATTLEANIMOAMSET_01 battleanimoam $04, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_01
battleanimoam $08, 4, .OAMData_02 ; BATTLEANIMOAMSET_02 battleanimoam $08, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_02
battleanimoam $09, 4, .OAMData_03 ; BATTLEANIMOAMSET_03 battleanimoam $09, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_03
battleanimoam $0d, 4, .OAMData_04 ; BATTLEANIMOAMSET_04 battleanimoam $0d, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_04
battleanimoam $0f, 4, .OAMData_03 ; BATTLEANIMOAMSET_05 battleanimoam $0f, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_05
battleanimoam $13, 4, .OAMData_04 ; BATTLEANIMOAMSET_06 battleanimoam $13, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_06
battleanimoam $04, 16, .OAMData_00 ; BATTLEANIMOAMSET_07 battleanimoam $04, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_07
battleanimoam $08, 16, .OAMData_00 ; BATTLEANIMOAMSET_08 battleanimoam $08, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_08
battleanimoam $08, 16, .OAMData_09 ; BATTLEANIMOAMSET_09 battleanimoam $08, 16, .OAMData_09 ; BATTLE_ANIM_OAMSET_09
battleanimoam $00, 4, .OAMData_04 ; BATTLEANIMOAMSET_0A battleanimoam $00, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_0A
battleanimoam $02, 4, .OAMData_03 ; BATTLEANIMOAMSET_0B battleanimoam $02, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_0B
battleanimoam $06, 2, .OAMData_0c ; BATTLEANIMOAMSET_0C battleanimoam $06, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_0C
battleanimoam $07, 2, .OAMData_0c ; BATTLEANIMOAMSET_0D battleanimoam $07, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_0D
battleanimoam $02, 4, .OAMData_04 ; BATTLEANIMOAMSET_0E battleanimoam $02, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_0E
battleanimoam $04, 1, .OAMData_0f ; BATTLEANIMOAMSET_0F battleanimoam $04, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_0F
battleanimoam $05, 1, .OAMData_0f ; BATTLEANIMOAMSET_10 battleanimoam $05, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_10
battleanimoam $00, 2, .OAMData_11 ; BATTLEANIMOAMSET_11 battleanimoam $00, 2, .OAMData_11 ; BATTLE_ANIM_OAMSET_11
battleanimoam $02, 2, .OAMData_11 ; BATTLEANIMOAMSET_12 battleanimoam $02, 2, .OAMData_11 ; BATTLE_ANIM_OAMSET_12
battleanimoam $00, 4, .OAMData_13 ; BATTLEANIMOAMSET_13 battleanimoam $00, 4, .OAMData_13 ; BATTLE_ANIM_OAMSET_13
battleanimoam $00, 1, .OAMData_0f ; BATTLEANIMOAMSET_14 battleanimoam $00, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_14
battleanimoam $01, 1, .OAMData_0f ; BATTLEANIMOAMSET_15 battleanimoam $01, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_15
battleanimoam $02, 1, .OAMData_0f ; BATTLEANIMOAMSET_16 battleanimoam $02, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_16
battleanimoam $03, 1, .OAMData_0f ; BATTLEANIMOAMSET_17 battleanimoam $03, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_17
battleanimoam $00, 4, .OAMData_02 ; BATTLEANIMOAMSET_18 battleanimoam $00, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_18
battleanimoam $01, 16, .OAMData_00 ; BATTLEANIMOAMSET_19 battleanimoam $01, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_19
battleanimoam $05, 16, .OAMData_00 ; BATTLEANIMOAMSET_1A battleanimoam $05, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_1A
battleanimoam $00, 4, .OAMData_03 ; BATTLEANIMOAMSET_1B battleanimoam $00, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_1B
battleanimoam $05, 12, .OAMData_1c ; BATTLEANIMOAMSET_1C battleanimoam $05, 12, .OAMData_1c ; BATTLE_ANIM_OAMSET_1C
battleanimoam $02, 4, .OAMData_02 ; BATTLEANIMOAMSET_1D battleanimoam $02, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_1D
battleanimoam $06, 1, .OAMData_0f ; BATTLEANIMOAMSET_1E battleanimoam $06, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_1E
battleanimoam $07, 1, .OAMData_0f ; BATTLEANIMOAMSET_1F battleanimoam $07, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_1F
battleanimoam $08, 1, .OAMData_0f ; BATTLEANIMOAMSET_20 battleanimoam $08, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_20
battleanimoam $04, 4, .OAMData_03 ; BATTLEANIMOAMSET_21 battleanimoam $04, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_21
battleanimoam $09, 22, .OAMData_22 ; BATTLEANIMOAMSET_22 battleanimoam $09, 22, .OAMData_22 ; BATTLE_ANIM_OAMSET_22
battleanimoam $04, 2, .OAMData_11 ; BATTLEANIMOAMSET_23 battleanimoam $04, 2, .OAMData_11 ; BATTLE_ANIM_OAMSET_23
battleanimoam $06, 2, .OAMData_11 ; BATTLEANIMOAMSET_24 battleanimoam $06, 2, .OAMData_11 ; BATTLE_ANIM_OAMSET_24
battleanimoam $0c, 1, .OAMData_0f ; BATTLEANIMOAMSET_25 battleanimoam $0c, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_25
battleanimoam $0a, 1, .OAMData_0f ; BATTLEANIMOAMSET_26 battleanimoam $0a, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_26
battleanimoam $0b, 4, .OAMData_02 ; BATTLEANIMOAMSET_27 battleanimoam $0b, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_27
battleanimoam $08, 4, .OAMData_04 ; BATTLEANIMOAMSET_28 battleanimoam $08, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_28
battleanimoam $06, 4, .OAMData_04 ; BATTLEANIMOAMSET_29 battleanimoam $06, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_29
battleanimoam $00, 5, .OAMData_2a ; BATTLEANIMOAMSET_2A battleanimoam $00, 5, .OAMData_2a ; BATTLE_ANIM_OAMSET_2A
battleanimoam $03, 6, .OAMData_2b ; BATTLEANIMOAMSET_2B battleanimoam $03, 6, .OAMData_2b ; BATTLE_ANIM_OAMSET_2B
battleanimoam $00, 7, .OAMData_2c ; BATTLEANIMOAMSET_2C battleanimoam $00, 7, .OAMData_2c ; BATTLE_ANIM_OAMSET_2C
battleanimoam $03, 8, .OAMData_2d ; BATTLEANIMOAMSET_2D battleanimoam $03, 8, .OAMData_2d ; BATTLE_ANIM_OAMSET_2D
battleanimoam $00, 9, .OAMData_2e ; BATTLEANIMOAMSET_2E battleanimoam $00, 9, .OAMData_2e ; BATTLE_ANIM_OAMSET_2E
battleanimoam $00, 4, .OAMData_2f ; BATTLEANIMOAMSET_2F battleanimoam $00, 4, .OAMData_2f ; BATTLE_ANIM_OAMSET_2F
battleanimoam $02, 4, .OAMData_30 ; BATTLEANIMOAMSET_30 battleanimoam $02, 4, .OAMData_30 ; BATTLE_ANIM_OAMSET_30
battleanimoam $04, 6, .OAMData_31 ; BATTLEANIMOAMSET_31 battleanimoam $04, 6, .OAMData_31 ; BATTLE_ANIM_OAMSET_31
battleanimoam $00, 2, .OAMData_32 ; BATTLEANIMOAMSET_32 battleanimoam $00, 2, .OAMData_32 ; BATTLE_ANIM_OAMSET_32
battleanimoam $00, 7, .OAMData_33 ; BATTLEANIMOAMSET_33 battleanimoam $00, 7, .OAMData_33 ; BATTLE_ANIM_OAMSET_33
battleanimoam $00, 14, .OAMData_32 ; BATTLEANIMOAMSET_34 battleanimoam $00, 14, .OAMData_32 ; BATTLE_ANIM_OAMSET_34
battleanimoam $00, 21, .OAMData_33 ; BATTLEANIMOAMSET_35 battleanimoam $00, 21, .OAMData_33 ; BATTLE_ANIM_OAMSET_35
battleanimoam $00, 2, .OAMData_36 ; BATTLEANIMOAMSET_36 battleanimoam $00, 2, .OAMData_36 ; BATTLE_ANIM_OAMSET_36
battleanimoam $00, 6, .OAMData_36 ; BATTLEANIMOAMSET_37 battleanimoam $00, 6, .OAMData_36 ; BATTLE_ANIM_OAMSET_37
battleanimoam $00, 10, .OAMData_36 ; BATTLEANIMOAMSET_38 battleanimoam $00, 10, .OAMData_36 ; BATTLE_ANIM_OAMSET_38
battleanimoam $00, 14, .OAMData_36 ; BATTLEANIMOAMSET_39 battleanimoam $00, 14, .OAMData_36 ; BATTLE_ANIM_OAMSET_39
battleanimoam $00, 2, .OAMData_3a ; BATTLEANIMOAMSET_3A battleanimoam $00, 2, .OAMData_3a ; BATTLE_ANIM_OAMSET_3A
battleanimoam $00, 6, .OAMData_3a ; BATTLEANIMOAMSET_3B battleanimoam $00, 6, .OAMData_3a ; BATTLE_ANIM_OAMSET_3B
battleanimoam $00, 10, .OAMData_3a ; BATTLEANIMOAMSET_3C battleanimoam $00, 10, .OAMData_3a ; BATTLE_ANIM_OAMSET_3C
battleanimoam $00, 14, .OAMData_3a ; BATTLEANIMOAMSET_3D battleanimoam $00, 14, .OAMData_3a ; BATTLE_ANIM_OAMSET_3D
battleanimoam $00, 4, .OAMData_3e ; BATTLEANIMOAMSET_3E battleanimoam $00, 4, .OAMData_3e ; BATTLE_ANIM_OAMSET_3E
battleanimoam $00, 16, .OAMData_3e ; BATTLEANIMOAMSET_3F battleanimoam $00, 16, .OAMData_3e ; BATTLE_ANIM_OAMSET_3F
battleanimoam $00, 26, .OAMData_3e ; BATTLEANIMOAMSET_40 battleanimoam $00, 26, .OAMData_3e ; BATTLE_ANIM_OAMSET_40
battleanimoam $00, 26, .OAMData_41 ; BATTLEANIMOAMSET_41 battleanimoam $00, 26, .OAMData_41 ; BATTLE_ANIM_OAMSET_41
battleanimoam $0e, 4, .OAMData_42 ; BATTLEANIMOAMSET_42 battleanimoam $0e, 4, .OAMData_42 ; BATTLE_ANIM_OAMSET_42
battleanimoam $0e, 8, .OAMData_42 ; BATTLEANIMOAMSET_43 battleanimoam $0e, 8, .OAMData_42 ; BATTLE_ANIM_OAMSET_43
battleanimoam $0e, 4, .OAMData_44 ; BATTLEANIMOAMSET_44 battleanimoam $0e, 4, .OAMData_44 ; BATTLE_ANIM_OAMSET_44
battleanimoam $0e, 8, .OAMData_44 ; BATTLEANIMOAMSET_45 battleanimoam $0e, 8, .OAMData_44 ; BATTLE_ANIM_OAMSET_45
battleanimoam $0e, 4, .OAMData_46 ; BATTLEANIMOAMSET_46 battleanimoam $0e, 4, .OAMData_46 ; BATTLE_ANIM_OAMSET_46
battleanimoam $0e, 4, .OAMData_47 ; BATTLEANIMOAMSET_47 battleanimoam $0e, 4, .OAMData_47 ; BATTLE_ANIM_OAMSET_47
battleanimoam $00, 6, .OAMData_48 ; BATTLEANIMOAMSET_48 battleanimoam $00, 6, .OAMData_48 ; BATTLE_ANIM_OAMSET_48
battleanimoam $03, 4, .OAMData_49 ; BATTLEANIMOAMSET_49 battleanimoam $03, 4, .OAMData_49 ; BATTLE_ANIM_OAMSET_49
battleanimoam $03, 2, .OAMData_4a ; BATTLEANIMOAMSET_4A battleanimoam $03, 2, .OAMData_4a ; BATTLE_ANIM_OAMSET_4A
battleanimoam $01, 5, .OAMData_0f ; BATTLEANIMOAMSET_4B battleanimoam $01, 5, .OAMData_0f ; BATTLE_ANIM_OAMSET_4B
battleanimoam $01, 6, .OAMData_4c ; BATTLEANIMOAMSET_4C battleanimoam $01, 6, .OAMData_4c ; BATTLE_ANIM_OAMSET_4C
battleanimoam $01, 7, .OAMData_4d ; BATTLEANIMOAMSET_4D battleanimoam $01, 7, .OAMData_4d ; BATTLE_ANIM_OAMSET_4D
battleanimoam $01, 3, .OAMData_4d ; BATTLEANIMOAMSET_4E battleanimoam $01, 3, .OAMData_4d ; BATTLE_ANIM_OAMSET_4E
battleanimoam $01, 8, .OAMData_4f ; BATTLEANIMOAMSET_4F battleanimoam $01, 8, .OAMData_4f ; BATTLE_ANIM_OAMSET_4F
battleanimoam $01, 9, .OAMData_50 ; BATTLEANIMOAMSET_50 battleanimoam $01, 9, .OAMData_50 ; BATTLE_ANIM_OAMSET_50
battleanimoam $01, 10, .OAMData_51 ; BATTLEANIMOAMSET_51 battleanimoam $01, 10, .OAMData_51 ; BATTLE_ANIM_OAMSET_51
battleanimoam $01, 6, .OAMData_51 ; BATTLEANIMOAMSET_52 battleanimoam $01, 6, .OAMData_51 ; BATTLE_ANIM_OAMSET_52
battleanimoam $00, 9, .OAMData_01 ; BATTLEANIMOAMSET_53 battleanimoam $00, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_53
battleanimoam $04, 4, .OAMData_02 ; BATTLEANIMOAMSET_54 battleanimoam $04, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_54
battleanimoam $05, 4, .OAMData_02 ; BATTLEANIMOAMSET_55 battleanimoam $05, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_55
battleanimoam $00, 2, .OAMData_56 ; BATTLEANIMOAMSET_56 battleanimoam $00, 2, .OAMData_56 ; BATTLE_ANIM_OAMSET_56
battleanimoam $02, 2, .OAMData_56 ; BATTLEANIMOAMSET_57 battleanimoam $02, 2, .OAMData_56 ; BATTLE_ANIM_OAMSET_57
battleanimoam $04, 2, .OAMData_56 ; BATTLEANIMOAMSET_58 battleanimoam $04, 2, .OAMData_56 ; BATTLE_ANIM_OAMSET_58
battleanimoam $02, 4, .OAMData_59 ; BATTLEANIMOAMSET_59 battleanimoam $02, 4, .OAMData_59 ; BATTLE_ANIM_OAMSET_59
battleanimoam $02, 4, .OAMData_5a ; BATTLEANIMOAMSET_5A battleanimoam $02, 4, .OAMData_5a ; BATTLE_ANIM_OAMSET_5A
battleanimoam $02, 2, .OAMData_0c ; BATTLEANIMOAMSET_5B battleanimoam $02, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_5B
battleanimoam $04, 2, .OAMData_0c ; BATTLEANIMOAMSET_5C battleanimoam $04, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_5C
battleanimoam $06, 4, .OAMData_5d ; BATTLEANIMOAMSET_5D battleanimoam $06, 4, .OAMData_5d ; BATTLE_ANIM_OAMSET_5D
battleanimoam $08, 2, .OAMData_0c ; BATTLEANIMOAMSET_5E battleanimoam $08, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_5E
battleanimoam $09, 2, .OAMData_0c ; BATTLEANIMOAMSET_5F battleanimoam $09, 2, .OAMData_0c ; BATTLE_ANIM_OAMSET_5F
battleanimoam $05, 2, .OAMData_60 ; BATTLEANIMOAMSET_60 battleanimoam $05, 2, .OAMData_60 ; BATTLE_ANIM_OAMSET_60
battleanimoam $00, 2, .OAMData_61 ; BATTLEANIMOAMSET_61 battleanimoam $00, 2, .OAMData_61 ; BATTLE_ANIM_OAMSET_61
battleanimoam $00, 5, .OAMData_61 ; BATTLEANIMOAMSET_62 battleanimoam $00, 5, .OAMData_61 ; BATTLE_ANIM_OAMSET_62
battleanimoam $00, 9, .OAMData_61 ; BATTLEANIMOAMSET_63 battleanimoam $00, 9, .OAMData_61 ; BATTLE_ANIM_OAMSET_63
battleanimoam $09, 9, .OAMData_61 ; BATTLEANIMOAMSET_64 battleanimoam $09, 9, .OAMData_61 ; BATTLE_ANIM_OAMSET_64
battleanimoam $00, 4, .OAMData_65 ; BATTLEANIMOAMSET_65 battleanimoam $00, 4, .OAMData_65 ; BATTLE_ANIM_OAMSET_65
battleanimoam $00, 7, .OAMData_65 ; BATTLEANIMOAMSET_66 battleanimoam $00, 7, .OAMData_65 ; BATTLE_ANIM_OAMSET_66
battleanimoam $00, 9, .OAMData_65 ; BATTLEANIMOAMSET_67 battleanimoam $00, 9, .OAMData_65 ; BATTLE_ANIM_OAMSET_67
battleanimoam $09, 9, .OAMData_65 ; BATTLEANIMOAMSET_68 battleanimoam $09, 9, .OAMData_65 ; BATTLE_ANIM_OAMSET_68
battleanimoam $04, 1, .OAMData_69 ; BATTLEANIMOAMSET_69 battleanimoam $04, 1, .OAMData_69 ; BATTLE_ANIM_OAMSET_69
battleanimoam $05, 2, .OAMData_6a ; BATTLEANIMOAMSET_6A battleanimoam $05, 2, .OAMData_6a ; BATTLE_ANIM_OAMSET_6A
battleanimoam $06, 4, .OAMData_03 ; BATTLEANIMOAMSET_6B battleanimoam $06, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_6B
battleanimoam $0a, 4, .OAMData_03 ; BATTLEANIMOAMSET_6C battleanimoam $0a, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_6C
battleanimoam $0e, 4, .OAMData_03 ; BATTLEANIMOAMSET_6D battleanimoam $0e, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_6D
battleanimoam $08, 5, .OAMData_6e ; BATTLEANIMOAMSET_6E battleanimoam $08, 5, .OAMData_6e ; BATTLE_ANIM_OAMSET_6E
battleanimoam $0d, 3, .OAMData_6f ; BATTLEANIMOAMSET_6F battleanimoam $0d, 3, .OAMData_6f ; BATTLE_ANIM_OAMSET_6F
battleanimoam $01, 8, .OAMData_70 ; BATTLEANIMOAMSET_70 battleanimoam $01, 8, .OAMData_70 ; BATTLE_ANIM_OAMSET_70
battleanimoam $03, 8, .OAMData_70 ; BATTLEANIMOAMSET_71 battleanimoam $03, 8, .OAMData_70 ; BATTLE_ANIM_OAMSET_71
battleanimoam $05, 8, .OAMData_70 ; BATTLEANIMOAMSET_72 battleanimoam $05, 8, .OAMData_70 ; BATTLE_ANIM_OAMSET_72
battleanimoam $07, 8, .OAMData_70 ; BATTLEANIMOAMSET_73 battleanimoam $07, 8, .OAMData_70 ; BATTLE_ANIM_OAMSET_73
battleanimoam $06, 4, .OAMData_02 ; BATTLEANIMOAMSET_74 battleanimoam $06, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_74
battleanimoam $07, 4, .OAMData_02 ; BATTLEANIMOAMSET_75 battleanimoam $07, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_75
battleanimoam $0a, 2, .OAMData_76 ; BATTLEANIMOAMSET_76 battleanimoam $0a, 2, .OAMData_76 ; BATTLE_ANIM_OAMSET_76
battleanimoam $00, 1, .OAMData_77 ; BATTLEANIMOAMSET_77 battleanimoam $00, 1, .OAMData_77 ; BATTLE_ANIM_OAMSET_77
battleanimoam $00, 3, .OAMData_78 ; BATTLEANIMOAMSET_78 battleanimoam $00, 3, .OAMData_78 ; BATTLE_ANIM_OAMSET_78
battleanimoam $00, 6, .OAMData_79 ; BATTLEANIMOAMSET_79 battleanimoam $00, 6, .OAMData_79 ; BATTLE_ANIM_OAMSET_79
battleanimoam $00, 9, .OAMData_7a ; BATTLEANIMOAMSET_7A battleanimoam $00, 9, .OAMData_7a ; BATTLE_ANIM_OAMSET_7A
battleanimoam $00, 12, .OAMData_7b ; BATTLEANIMOAMSET_7B battleanimoam $00, 12, .OAMData_7b ; BATTLE_ANIM_OAMSET_7B
battleanimoam $00, 14, .OAMData_7c ; BATTLEANIMOAMSET_7C battleanimoam $00, 14, .OAMData_7c ; BATTLE_ANIM_OAMSET_7C
battleanimoam $00, 15, .OAMData_7d ; BATTLEANIMOAMSET_7D battleanimoam $00, 15, .OAMData_7d ; BATTLE_ANIM_OAMSET_7D
battleanimoam $04, 4, .OAMData_03 ; BATTLEANIMOAMSET_7E battleanimoam $04, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_7E
battleanimoam $08, 4, .OAMData_03 ; BATTLEANIMOAMSET_7F battleanimoam $08, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_7F
battleanimoam $0d, 1, .OAMData_0f ; BATTLEANIMOAMSET_80 battleanimoam $0d, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_80
battleanimoam $0e, 4, .OAMData_81 ; BATTLEANIMOAMSET_81 battleanimoam $0e, 4, .OAMData_81 ; BATTLE_ANIM_OAMSET_81
battleanimoam $10, 1, .OAMData_0f ; BATTLEANIMOAMSET_82 battleanimoam $10, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_82
battleanimoam $11, 1, .OAMData_0f ; BATTLEANIMOAMSET_83 battleanimoam $11, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_83
battleanimoam $04, 2, .OAMData_6a ; BATTLEANIMOAMSET_84 battleanimoam $04, 2, .OAMData_6a ; BATTLE_ANIM_OAMSET_84
battleanimoam $05, 2, .OAMData_6a ; BATTLEANIMOAMSET_85 battleanimoam $05, 2, .OAMData_6a ; BATTLE_ANIM_OAMSET_85
battleanimoam $0a, 4, .OAMData_04 ; BATTLEANIMOAMSET_86 battleanimoam $0a, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_86
battleanimoam $00, 8, .OAMData_87 ; BATTLEANIMOAMSET_87 battleanimoam $00, 8, .OAMData_87 ; BATTLE_ANIM_OAMSET_87
battleanimoam $00, 12, .OAMData_88 ; BATTLEANIMOAMSET_88 battleanimoam $00, 12, .OAMData_88 ; BATTLE_ANIM_OAMSET_88
battleanimoam $00, 16, .OAMData_87 ; BATTLEANIMOAMSET_89 battleanimoam $00, 16, .OAMData_87 ; BATTLE_ANIM_OAMSET_89
battleanimoam $09, 2, .OAMData_8a ; BATTLEANIMOAMSET_8A battleanimoam $09, 2, .OAMData_8a ; BATTLE_ANIM_OAMSET_8A
battleanimoam $09, 4, .OAMData_8a ; BATTLEANIMOAMSET_8B battleanimoam $09, 4, .OAMData_8a ; BATTLE_ANIM_OAMSET_8B
battleanimoam $09, 6, .OAMData_8a ; BATTLEANIMOAMSET_8C battleanimoam $09, 6, .OAMData_8a ; BATTLE_ANIM_OAMSET_8C
battleanimoam $09, 8, .OAMData_8a ; BATTLEANIMOAMSET_8D battleanimoam $09, 8, .OAMData_8a ; BATTLE_ANIM_OAMSET_8D
battleanimoam $12, 5, .OAMData_8e ; BATTLEANIMOAMSET_8E battleanimoam $12, 5, .OAMData_8e ; BATTLE_ANIM_OAMSET_8E
battleanimoam $00, 4, .OAMData_8f ; BATTLEANIMOAMSET_8F battleanimoam $00, 4, .OAMData_8f ; BATTLE_ANIM_OAMSET_8F
battleanimoam $04, 4, .OAMData_8f ; BATTLEANIMOAMSET_90 battleanimoam $04, 4, .OAMData_8f ; BATTLE_ANIM_OAMSET_90
battleanimoam $08, 4, .OAMData_8f ; BATTLEANIMOAMSET_91 battleanimoam $08, 4, .OAMData_8f ; BATTLE_ANIM_OAMSET_91
battleanimoam $0c, 4, .OAMData_8f ; BATTLEANIMOAMSET_92 battleanimoam $0c, 4, .OAMData_8f ; BATTLE_ANIM_OAMSET_92
battleanimoam $00, 6, .OAMData_93 ; BATTLEANIMOAMSET_93 battleanimoam $00, 6, .OAMData_93 ; BATTLE_ANIM_OAMSET_93
battleanimoam $04, 4, .OAMData_03 ; BATTLEANIMOAMSET_94 battleanimoam $04, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_94
battleanimoam $0a, 4, .OAMData_04 ; BATTLEANIMOAMSET_95 battleanimoam $0a, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_95
battleanimoam $15, 4, .OAMData_30 ; BATTLEANIMOAMSET_96 battleanimoam $15, 4, .OAMData_30 ; BATTLE_ANIM_OAMSET_96
battleanimoam $04, 4, .OAMData_30 ; BATTLEANIMOAMSET_97 battleanimoam $04, 4, .OAMData_30 ; BATTLE_ANIM_OAMSET_97
battleanimoam $0c, 4, .OAMData_04 ; BATTLEANIMOAMSET_98 battleanimoam $0c, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_98
battleanimoam $0a, 4, .OAMData_99 ; BATTLEANIMOAMSET_99 battleanimoam $0a, 4, .OAMData_99 ; BATTLE_ANIM_OAMSET_99
battleanimoam $0c, 4, .OAMData_03 ; BATTLEANIMOAMSET_9A battleanimoam $0c, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_9A
battleanimoam $00, 36, .OAMData_9b ; BATTLEANIMOAMSET_9B battleanimoam $00, 36, .OAMData_9b ; BATTLE_ANIM_OAMSET_9B
battleanimoam $0d, 2, .OAMData_9c ; BATTLEANIMOAMSET_9C battleanimoam $0d, 2, .OAMData_9c ; BATTLE_ANIM_OAMSET_9C
battleanimoam $0d, 4, .OAMData_9c ; BATTLEANIMOAMSET_9D battleanimoam $0d, 4, .OAMData_9c ; BATTLE_ANIM_OAMSET_9D
battleanimoam $0d, 6, .OAMData_9c ; BATTLEANIMOAMSET_9E battleanimoam $0d, 6, .OAMData_9c ; BATTLE_ANIM_OAMSET_9E
battleanimoam $02, 8, .OAMData_9f ; BATTLEANIMOAMSET_9F battleanimoam $02, 8, .OAMData_9f ; BATTLE_ANIM_OAMSET_9F
battleanimoam $08, 7, .OAMData_a0 ; BATTLEANIMOAMSET_A0 battleanimoam $08, 7, .OAMData_a0 ; BATTLE_ANIM_OAMSET_A0
battleanimoam $08, 5, .OAMData_a0 ; BATTLEANIMOAMSET_A1 battleanimoam $08, 5, .OAMData_a0 ; BATTLE_ANIM_OAMSET_A1
battleanimoam $08, 3, .OAMData_a0 ; BATTLEANIMOAMSET_A2 battleanimoam $08, 3, .OAMData_a0 ; BATTLE_ANIM_OAMSET_A2
battleanimoam $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_A3 battleanimoam $00, 16, .OAMData_1c ; BATTLE_ANIM_OAMSET_A3
battleanimoam $00, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A4 battleanimoam $00, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A4
battleanimoam $06, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A5 battleanimoam $06, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A5
battleanimoam $0c, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A6 battleanimoam $0c, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A6
battleanimoam $12, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A7 battleanimoam $12, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A7
battleanimoam $18, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A8 battleanimoam $18, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A8
battleanimoam $1e, 9, .OAMData_a4 ; BATTLEANIMOAMSET_A9 battleanimoam $1e, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_A9
battleanimoam $24, 9, .OAMData_a4 ; BATTLEANIMOAMSET_AA battleanimoam $24, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_AA
battleanimoam $2a, 9, .OAMData_a4 ; BATTLEANIMOAMSET_AB battleanimoam $2a, 9, .OAMData_a4 ; BATTLE_ANIM_OAMSET_AB
battleanimoam $03, 4, .OAMData_ac ; BATTLEANIMOAMSET_AC battleanimoam $03, 4, .OAMData_ac ; BATTLE_ANIM_OAMSET_AC
battleanimoam $12, 4, .OAMData_03 ; BATTLEANIMOAMSET_AD battleanimoam $12, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_AD
battleanimoam $10, 4, .OAMData_04 ; BATTLEANIMOAMSET_AE battleanimoam $10, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_AE
battleanimoam $16, 1, .OAMData_0f ; BATTLEANIMOAMSET_AF battleanimoam $16, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_AF
battleanimoam $17, 4, .OAMData_02 ; BATTLEANIMOAMSET_B0 battleanimoam $17, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_B0
battleanimoam $18, 4, .OAMData_03 ; BATTLEANIMOAMSET_B1 battleanimoam $18, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_B1
battleanimoam $1c, 4, .OAMData_03 ; BATTLEANIMOAMSET_B2 battleanimoam $1c, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_B2
battleanimoam $20, 3, .OAMData_03 ; BATTLEANIMOAMSET_B3 battleanimoam $20, 3, .OAMData_03 ; BATTLE_ANIM_OAMSET_B3
battleanimoam $23, 4, .OAMData_04 ; BATTLEANIMOAMSET_B4 battleanimoam $23, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_B4
battleanimoam $25, 3, .OAMData_03 ; BATTLEANIMOAMSET_B5 battleanimoam $25, 3, .OAMData_03 ; BATTLE_ANIM_OAMSET_B5
battleanimoam $17, 4, .OAMData_03 ; BATTLEANIMOAMSET_B6 battleanimoam $17, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_B6
battleanimoam $0a, 16, .OAMData_00 ; BATTLEANIMOAMSET_B7 battleanimoam $0a, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_B7
battleanimoam $10, 16, .OAMData_1c ; BATTLEANIMOAMSET_B8 battleanimoam $10, 16, .OAMData_1c ; BATTLE_ANIM_OAMSET_B8
battleanimoam $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_B9 battleanimoam $00, 16, .OAMData_1c ; BATTLE_ANIM_OAMSET_B9
battleanimoam $04, 4, .OAMData_03 ; BATTLEANIMOAMSET_BA battleanimoam $04, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_BA
battleanimoam $08, 2, .OAMData_11 ; BATTLEANIMOAMSET_BB battleanimoam $08, 2, .OAMData_11 ; BATTLE_ANIM_OAMSET_BB
battleanimoam $20, 6, .OAMData_bc ; BATTLEANIMOAMSET_BC battleanimoam $20, 6, .OAMData_bc ; BATTLE_ANIM_OAMSET_BC
battleanimoam $08, 1, .OAMData_0f ; BATTLEANIMOAMSET_BD battleanimoam $08, 1, .OAMData_0f ; BATTLE_ANIM_OAMSET_BD
battleanimoam $04, 4, .OAMData_03 ; BATTLEANIMOAMSET_BE battleanimoam $04, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_BE
battleanimoam $1a, 4, .OAMData_30 ; BATTLEANIMOAMSET_BF battleanimoam $1a, 4, .OAMData_30 ; BATTLE_ANIM_OAMSET_BF
battleanimoam $16, 9, .OAMData_01 ; BATTLEANIMOAMSET_C0 battleanimoam $16, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_C0
battleanimoam $10, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C1 battleanimoam $10, 16, .OAMData_c1 ; BATTLE_ANIM_OAMSET_C1
battleanimoam $09, 6, .OAMData_c2 ; BATTLEANIMOAMSET_C2 battleanimoam $09, 6, .OAMData_c2 ; BATTLE_ANIM_OAMSET_C2
battleanimoam $11, 9, .OAMData_c3 ; BATTLEANIMOAMSET_C3 battleanimoam $11, 9, .OAMData_c3 ; BATTLE_ANIM_OAMSET_C3
battleanimoam $0e, 4, .OAMData_03 ; BATTLEANIMOAMSET_C4 battleanimoam $0e, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_C4
battleanimoam $0b, 4, .OAMData_30 ; BATTLEANIMOAMSET_C5 battleanimoam $0b, 4, .OAMData_30 ; BATTLE_ANIM_OAMSET_C5
battleanimoam $1c, 6, .OAMData_02 ; BATTLEANIMOAMSET_C6 battleanimoam $1c, 6, .OAMData_02 ; BATTLE_ANIM_OAMSET_C6
battleanimoam $20, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C7 battleanimoam $20, 16, .OAMData_c1 ; BATTLE_ANIM_OAMSET_C7
battleanimoam $05, 6, .OAMData_c8 ; BATTLEANIMOAMSET_C8 battleanimoam $05, 6, .OAMData_c8 ; BATTLE_ANIM_OAMSET_C8
battleanimoam $0b, 4, .OAMData_03 ; BATTLEANIMOAMSET_C9 battleanimoam $0b, 4, .OAMData_03 ; BATTLE_ANIM_OAMSET_C9
battleanimoam $09, 4, .OAMData_ca ; BATTLEANIMOAMSET_CA battleanimoam $09, 4, .OAMData_ca ; BATTLE_ANIM_OAMSET_CA
battleanimoam $0b, 4, .OAMData_04 ; BATTLEANIMOAMSET_CB battleanimoam $0b, 4, .OAMData_04 ; BATTLE_ANIM_OAMSET_CB
battleanimoam $11, 13, .OAMData_cc ; BATTLEANIMOAMSET_CC battleanimoam $11, 13, .OAMData_cc ; BATTLE_ANIM_OAMSET_CC
battleanimoam $00, 9, .OAMData_c3 ; BATTLEANIMOAMSET_CD battleanimoam $00, 9, .OAMData_c3 ; BATTLE_ANIM_OAMSET_CD
battleanimoam $09, 9, .OAMData_c3 ; BATTLEANIMOAMSET_CE battleanimoam $09, 9, .OAMData_c3 ; BATTLE_ANIM_OAMSET_CE
battleanimoam $00, 12, .OAMData_cf ; BATTLEANIMOAMSET_CF battleanimoam $00, 12, .OAMData_cf ; BATTLE_ANIM_OAMSET_CF
battleanimoam $06, 12, .OAMData_cf ; BATTLEANIMOAMSET_D0 battleanimoam $06, 12, .OAMData_cf ; BATTLE_ANIM_OAMSET_D0
battleanimoam $0c, 12, .OAMData_cf ; BATTLEANIMOAMSET_D1 battleanimoam $0c, 12, .OAMData_cf ; BATTLE_ANIM_OAMSET_D1
battleanimoam $12, 12, .OAMData_cf ; BATTLEANIMOAMSET_D2 battleanimoam $12, 12, .OAMData_cf ; BATTLE_ANIM_OAMSET_D2
battleanimoam $00, 13, .OAMData_cc ; BATTLEANIMOAMSET_D3 battleanimoam $00, 13, .OAMData_cc ; BATTLE_ANIM_OAMSET_D3
battleanimoam $00, 7, .OAMData_d4 ; BATTLEANIMOAMSET_D4 battleanimoam $00, 7, .OAMData_d4 ; BATTLE_ANIM_OAMSET_D4
battleanimoam $00, 6, .OAMData_d5 ; BATTLEANIMOAMSET_D5 battleanimoam $00, 6, .OAMData_d5 ; BATTLE_ANIM_OAMSET_D5
battleanimoam $00, 14, .OAMData_d6 ; BATTLEANIMOAMSET_D6 battleanimoam $00, 14, .OAMData_d6 ; BATTLE_ANIM_OAMSET_D6
battleanimoam $00, 12, .OAMData_d7 ; BATTLEANIMOAMSET_D7 battleanimoam $00, 12, .OAMData_d7 ; BATTLE_ANIM_OAMSET_D7
assert_table_length NUM_BATTLEANIMOAMSETS assert_table_length NUM_BATTLE_ANIM_OAMSETS
.OAMData_11: .OAMData_11:
dbsprite -1, -1, 4, 0, $00, $0 dbsprite -1, -1, 4, 0, $00, $0

View File

@@ -5,7 +5,7 @@ MACRO anim_obj_gfx
ENDM ENDM
AnimObjGFX: AnimObjGFX:
; entries correspond to ANIM_GFX_* constants ; entries correspond to BATTLE_ANIM_GFX_* constants
table_width 4, AnimObjGFX table_width 4, AnimObjGFX
anim_obj_gfx 0, AnimObj00GFX anim_obj_gfx 0, AnimObj00GFX
anim_obj_gfx 21, AnimObjHitGFX anim_obj_gfx 21, AnimObjHitGFX

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,112 @@
SpriteAnimObjects:
; entries correspond to SPRITE_ANIM_OBJ_* constants (see constants/sprite_anim_constants.asm)
table_width 3, SpriteAnimObjects
; frameset, sequence, tile
; SPRITE_ANIM_OBJ_PARTY_MON
db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_FUNC_PARTY_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_GS_TITLE_TRAIL
db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_FUNC_GS_TITLE_TRAIL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_NAMING_SCREEN_CURSOR
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_FUNC_NAMING_SCREEN_CURSOR, SPRITE_ANIM_DICT_TEXT_CURSOR
; SPRITE_ANIM_OBJ_GAMEFREAK_LOGO
db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_FUNC_GAMEFREAK_LOGO, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_STAR
db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_STAR, SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_STAR, SPRITE_ANIM_DICT_GS_SPLASH
; SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_SPARKLE
db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_SPARKLE, SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_SPARKLE, SPRITE_ANIM_DICT_GS_SPLASH
; SPRITE_ANIM_OBJ_SLOTS_GOLEM
db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_FUNC_SLOTS_GOLEM, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_OBJ_SLOTS_CHANSEY
db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_FUNC_SLOTS_CHANSEY, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_OBJ_SLOTS_EGG
db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_FUNC_SLOTS_EGG, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_OBJ_COMPOSE_MAIL_CURSOR
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_FUNC_MAIL_CURSOR, SPRITE_ANIM_DICT_TEXT_CURSOR
; SPRITE_ANIM_OBJ_RED_WALK
db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_UNUSED_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_FUNC_UNUSED_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_OBJ_MEMORY_GAME_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_FUNC_MEMORY_GAME_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_OBJ_POKEGEAR_ARROW
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_FUNC_POKEGEAR_ARROW, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_OBJ_TRADE_POKE_BALL
db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_FUNC_TRADE_POKE_BALL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_TRADE_POOF
db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_TRADE_TUBE_BULGE
db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_FUNC_TRADE_TUBE_BULGE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_TRADEMON_ICON
db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_FUNC_TRADEMON_IN_TUBE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_TRADEMON_BUBBLE
db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_FUNC_TRADEMON_IN_TUBE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_EVOLUTION_BALL_OF_LIGHT
db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_FUNC_REVEAL_NEW_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB
db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_FUNC_RADIO_TUNING_KNOB, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEAF
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_FUNC_CUT_LEAVES, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_CUT_TREE
db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_FLY_LEAF
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_FUNC_FLY_LEAF, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_EGG_CRACK
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_GS_INTRO_HO_OH_LUGIA
db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_FUNC_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_HEADBUTT
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_EGG_HATCH
db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_FUNC_REVEAL_NEW_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_EZCHAT_CURSOR
db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1, SPRITE_ANIM_FUNC_EZCHAT_CURSOR, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_BLUE_WALK
db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MAGNET_TRAIN_BLUE
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_BALL
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_BALL
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_CABLE_BULGE, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_PULSE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_PULSE, SPRITE_ANIM_FUNC_MOBILE_TRADE_SENT_PULSE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_PULSE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_PULSE, SPRITE_ANIM_FUNC_MOBILE_TRADE_OT_PULSE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_MOBILE_TRADE_PING
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_PING, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_SUICUNE
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_FUNC_INTRO_SUICUNE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_PICHU
db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_FUNC_INTRO_PICHU_WOOPER, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_WOOPER
db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_FUNC_INTRO_PICHU_WOOPER, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_UNOWN
db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_FUNC_INTRO_UNOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_UNOWN_F
db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_FUNC_INTRO_UNOWN_F, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_FUNC_INTRO_SUICUNE_AWAY, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_CELEBI
db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_DOWN
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_DOWN, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_UP
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_UP, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_UP
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_UP, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_LEFT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_LEFT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
assert_table_length NUM_SPRITE_ANIM_OBJS

View File

@@ -1,112 +0,0 @@
SpriteAnimSeqData:
; entries correspond to SPRITE_ANIM_INDEX_* constants (see constants/sprite_anim_constants.asm)
table_width 3, SpriteAnimSeqData
; frameset, sequence, tile
; SPRITE_ANIM_INDEX_PARTY_MON
db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, SPRITE_ANIM_DICT_TEXT_CURSOR
; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR
db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_STAR, SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_STAR, SPRITE_ANIM_DICT_GS_SPLASH
; SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE
db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_SPARKLE, SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_SPARKLE, SPRITE_ANIM_DICT_GS_SPLASH
; SPRITE_ANIM_INDEX_SLOTS_GOLEM
db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_INDEX_SLOTS_EGG
db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, SPRITE_ANIM_DICT_SLOTS
; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, SPRITE_ANIM_DICT_TEXT_CURSOR
; SPRITE_ANIM_INDEX_RED_WALK
db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_UNUSED_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_UNUSED_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_MEMORY_GAME_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_POKEGEAR_ARROW, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_TRADE_POOF
db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_TRADEMON_ICON
db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEAF
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_CUT_TREE
db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_FLY_LEAF
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_EGG_CRACK
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_HEADBUTT
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_EGG_HATCH
db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_EZCHAT_CURSOR
db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1, SPRITE_ANIM_SEQ_EZCHAT_CURSOR, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_BLUE_WALK
db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_CABLE_BULGE, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_PULSE, SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_PULSE, SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_PING, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_SUICUNE
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_PICHU
db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_WOOPER
db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_UNOWN
db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_UNOWN_F
db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_CELEBI
db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_DOWN
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_DOWN, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_UP
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_UP, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_UP
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_UP, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_LEFT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_LEFT, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT, SPRITE_ANIM_SEQ_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
assert_table_length NUM_SPRITE_ANIM_INDEXES

View File

@@ -14,7 +14,7 @@ Defined in [macros/scripts/battle_anims.asm](https://github.com/pret/pokecrystal
Spawns an *object* at coordinate (*x*, *y*). Spawns an *object* at coordinate (*x*, *y*).
- *object*: `ANIM_OBJ` constants (see [constants/battle_anim_constants.asm](https://github.com/pret/pokecrystal/blob/master/constants/battle_anim_constants.asm)) - *object*: `BATTLE_ANIM_OBJ` constants (see [constants/battle_anim_constants.asm](https://github.com/pret/pokecrystal/blob/master/constants/battle_anim_constants.asm))
- *x*: the x position in pixels - *x*: the x position in pixels
- *y*: the y position in pixels - *y*: the y position in pixels
- *x_tile*: an added x position in tiles (8 pixels) - *x_tile*: an added x position in tiles (8 pixels)
@@ -84,8 +84,8 @@ Since there can't be two of the same bg effect, the effect type is used. This is
## `$DA`: `anim_battlergfx_1row` ## `$DA`: `anim_battlergfx_1row`
Loads animation graphics for the bottom one or two rows of the enemy pokemon and the top one or two rows of the player's. Loads animation graphics for the bottom one or two rows of the enemy pokemon and the top one or two rows of the player's.
These graphics are identified through `ANIM_GFX_ENEMYFEET` and `ANIM_GFX_PLAYERHEAD`. These graphics are identified through `BATTLE_ANIM_GFX_ENEMYFEET` and `BATTLE_ANIM_GFX_PLAYERHEAD`.
Caveats: Caveats:
- Doesn't work with `anim_4gfx` and `anim_5gfx`. - Doesn't work with `anim_4gfx` and `anim_5gfx`.

View File

@@ -2700,7 +2700,7 @@ If `IsInArray` returns `nc`, data at `bc` will be executed as code.
-; BUG: BattleAnimCmd only clears the first 6⅔ objects (see docs/bugs_and_glitches.md) -; BUG: BattleAnimCmd only clears the first 6⅔ objects (see docs/bugs_and_glitches.md)
ld hl, wActiveAnimObjects ld hl, wActiveAnimObjects
- ld a, $a0 - ld a, $a0
+ ld a, NUM_ANIM_OBJECTS * BATTLEANIMSTRUCT_LENGTH + ld a, NUM_BATTLE_ANIM_STRUCTS * BATTLEANIMSTRUCT_LENGTH
.loop .loop
ld [hl], 0 ld [hl], 0
inc hl inc hl

View File

@@ -672,7 +672,7 @@ _Sine::
calc_sine_wave calc_sine_wave
``` ```
`Sprites_Cosine` and `Sprites_Sine` in [engine/gfx/sprites.asm](https://github.com/pret/pokecrystal/blob/master/engine/gfx/sprites.asm): `Sprites_Cosine` and `Sprites_Sine` in [engine/sprite_anims/core.asm](https://github.com/pret/pokecrystal/blob/master/engine/sprite_anims/core.asm):
```asm ```asm
Sprites_Cosine: Sprites_Cosine:

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -14,14 +14,14 @@ CelebiShrineEvent:
ld [wVramState], a ld [wVramState], a
call LoadCelebiGFX call LoadCelebiGFX
depixel 0, 10, 7, 0 depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI ld a, SPRITE_ANIM_OBJ_CELEBI
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI ld [hl], SPECIALCELEBIEVENT_CELEBI
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_CELEBI ld [hl], SPRITE_ANIM_FUNC_CELEBI
ld hl, SPRITEANIMSTRUCT_VAR4 ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc add hl, bc
ld a, $80 ld a, $80
@@ -111,7 +111,7 @@ CelebiEvent_SpawnLeaf: ; unreferenced
add $40 add $40
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_OBJ_FLY_LEAF ; fly land
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc

View File

@@ -31,7 +31,7 @@ ShakeHeadbuttTree:
lb bc, BANK(HeadbuttTreeGFX), 8 lb bc, BANK(HeadbuttTreeGFX), 8
call Request2bpp call Request2bpp
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_HEADBUTT ld a, SPRITE_ANIM_OBJ_HEADBUTT
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
@@ -163,7 +163,7 @@ OWCutJumptable:
Cut_SpawnAnimateTree: Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree ld a, SPRITE_ANIM_OBJ_CUT_TREE ; cut tree
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
@@ -216,7 +216,7 @@ Cut_WaitAnimSFX:
Cut_SpawnLeaf: Cut_SpawnLeaf:
push de push de
push af push af
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf ld a, SPRITE_ANIM_OBJ_LEAF ; leaf
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
@@ -303,14 +303,14 @@ FlyFromAnim:
ld [wVramState], a ld [wVramState], a
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 10, 10, 4, 0 depixel 10, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_OBJ_RED_WALK
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_FLY_FROM ld [hl], SPRITE_ANIM_FUNC_FLY_FROM
ld a, 128 ld a, 128
ld [wFrameCounter], a ld [wFrameCounter], a
.loop .loop
@@ -337,14 +337,14 @@ FlyToAnim:
ld [wVramState], a ld [wVramState], a
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 31, 10, 4, 0 depixel 31, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_OBJ_RED_WALK
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_FLY_TO ld [hl], SPRITE_ANIM_FUNC_FLY_TO
ld hl, SPRITEANIMSTRUCT_VAR4 ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc add hl, bc
ld [hl], 11 * TILE_WIDTH ld [hl], 11 * TILE_WIDTH
@@ -436,7 +436,7 @@ FlyFunction_FrameTimer:
add 8 * 8 ; gives a number in [$40, $50, $60, $70] add 8 * 8 ; gives a number in [$40, $50, $60, $70]
ld d, a ld d, a
ld e, 0 ld e, 0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ld a, SPRITE_ANIM_OBJ_FLY_LEAF
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc

View File

@@ -292,7 +292,7 @@ MagnetTrain_Jumptable:
ld d, (8 + 2) * TILE_WIDTH + 5 ld d, (8 + 2) * TILE_WIDTH + 5
ld a, [wMagnetTrainPlayerSpriteInitX] ld a, [wMagnetTrainPlayerSpriteInitX]
ld e, a ld e, a
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wPlayerGender) ld a, BANK(wPlayerGender)
@@ -300,7 +300,7 @@ MagnetTrain_Jumptable:
ld a, [wPlayerGender] ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_BLUE
.got_gender .got_gender
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a

View File

@@ -109,7 +109,7 @@ endr
.spawn_object .spawn_object
depixel 6, 3, 4, 4 depixel 6, 3, 4, 4
ld a, SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR ld a, SPRITE_ANIM_OBJ_MEMORY_GAME_CURSOR
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, 5 ld a, 5
ld [wMemoryGameNumberTriesRemaining], a ld [wMemoryGameNumberTriesRemaining], a

Some files were not shown because too many files have changed in this diff Show More